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

[TUGAS_SELEKSI_2_13515140_18215001] #8

Open
wants to merge 28 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
222b034
Initial commit
FranciscoKen Jul 8, 2017
0f06ded
file javascript untuk peta asean
priskar Jul 8, 2017
91eb048
rename file peta asean.js jadi peta-asean.js
priskar Jul 8, 2017
20e99ca
Merge pull request #1 from priskar/master
FranciscoKen Jul 10, 2017
44d6fdc
Kerangka Program (HTML)
FranciscoKen Jul 10, 2017
9fabb1f
grafik batang pengguna internet tahun 2014-2016
priskar Jul 10, 2017
c45b4f2
javascript library Chart.js untuk membuat grafik
priskar Jul 10, 2017
cfb537c
edit penulisan js code
priskar Jul 11, 2017
47f7012
*add file data pengguna internet*
priskar Jul 18, 2017
03aecb8
edit grafik batang
priskar Jul 21, 2017
77e4fba
edit nama variabel
priskar Jul 21, 2017
2d5bc63
grafik garis pengguna internet di negara asean
priskar Jul 24, 2017
5559f89
menampilkan nama negara yg ditunjuk mouse
priskar Jul 26, 2017
e68a9c0
edit variabel
priskar Jul 26, 2017
0ca12b4
delete README.md
priskar Jul 31, 2017
37b3a44
Merge remote-tracking branch 'upstream/master'
priskar Jul 31, 2017
dc375be
tambah data kategori
priskar Aug 3, 2017
5d1e603
edit data kategori
priskar Aug 3, 2017
4971f0a
tambah kategori pd grafik garis
priskar Aug 5, 2017
03bb723
sudah pakai tempate, chart juga sudah menyesuaikan dengan yang terbaru
FranciscoKen Aug 7, 2017
81c1d91
sudah pakai tempate, chart juga sudah menyesuaikan dengan yang terbaru
FranciscoKen Aug 7, 2017
d49ad22
delete file html
priskar Aug 7, 2017
7ecf118
tambah gambar homepage & file html
priskar Aug 7, 2017
9ebb94d
add file html
priskar Aug 7, 2017
1db6ff4
add gambar
priskar Aug 7, 2017
588b188
edit README & html
priskar Aug 7, 2017
1284af8
edit file js tiap negara & index.html
priskar Aug 7, 2017
87ce823
edit index.html
priskar Aug 7, 2017
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
7 changes: 5 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# Seleksi Warga Basdat 2017
Tugas Seleksi Warga Basdat

Repository ini digunakan untuk pengumpulan tugas. Di awal pengerjaan, fork repository ini. Ketika akan mengumpulkan, buat pull request dengan nama `[TUGAS_SELEKSI_2_<NIM 1>_<NIM 2>]`.
Kelompok DV1

Francisco Kenandi (13515140)
Priska Reysa (18215001)
4 changes: 4 additions & 0 deletions css/font-awesome.min.css

Large diffs are not rendered by default.

440 changes: 440 additions & 0 deletions css/media.css

Large diffs are not rendered by default.

320 changes: 320 additions & 0 deletions css/theme.css

Large diffs are not rendered by default.

Binary file added fonts/FontAwesome.otf
Binary file not shown.
Binary file added fonts/fontawesome-webfont.eot
Binary file not shown.
640 changes: 640 additions & 0 deletions fonts/fontawesome-webfont.svg
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 fonts/fontawesome-webfont.ttf
Binary file not shown.
Binary file added fonts/fontawesome-webfont.woff
Binary file not shown.
Binary file added fonts/fontawesome-webfont.woff2
Binary file not shown.
Binary file added img/Banner-bg.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 img/Contact-bg.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 img/Develop-hover-icn.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 img/Development-bg.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 img/Development-cn.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 img/Get-bg.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 img/Services-bg.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 img/Shadow-img.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 img/Slider-img1.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 img/Slider-img2.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 img/about-shadow.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 img/concept-bg.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 img/concept-hover-icn.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 img/concept-icn.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 img/desgin-bg.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 img/desgin-hover-icn.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 img/desgin-icn.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 img/divider-black.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 img/divider.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 img/facebook-icn.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 img/google-plus-icn.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 img/location-icn.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 img/mail-icn.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 img/map.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 img/next-arrow.png
Binary file added img/phone-icn.png
Binary file added img/prev-arrow.png
Binary file added img/systam-bg.jpg
Binary file added img/systam-hover-icn.png
Binary file added img/systam-icn.png
Binary file added img/twitter-icn.png
Binary file added img/using-internet1.jpg
Binary file added img/using-internet2.jpg
62 changes: 62 additions & 0 deletions index.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@

.container {
width : 100%;
}

/*header {
position: absolute;
right:0;
top:0;
left:0;
padding: 1em;
color: white;
background-color: black;
clear:left;
text-align:center;
}*/

footer {
position: absolute;
right:0;
bottom:0;
left:0;
padding: 1rem;
color: white;
background-color: black;
clear:left;
text-align:center;
}

.topnav {
background-color: #333;
overflow: hidden;
}

.topnav a {
float:left;
display : block;
color:#f2f2f2;
text-align: center;
padding: 14px 16px;
text-decoration: none;
font-size: 17px;
}

.topnav a:hover{
background :#ddd;
}

.topnav a.active{
background-volor: #4CAF50;
color:white;
}
/*nav ul a{
text-decoration: none;
}
*/
article {
/*margin-left : 170px;
border-left: 1px solid gray;*/
padding: 1em;
overflow: hidden;
}
311 changes: 311 additions & 0 deletions index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,311 @@
<!DOCTYPE html>
<html lang="en">

<head>
<meta charset="utf-8" />

<!-- Title Tag -->
<title>ASEAN Internet Growth</title>
<!--

November Template

http://www.templatemo.com/tm-473-november

-->
<!-- <<Mobile Viewport Code>> -->
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">

<!-- <<Attched Stylesheets>> -->
<link rel="stylesheet" href="css/theme.css" type="text/css" />
<link rel="stylesheet" href="css/media.css" type="text/css" />
<link rel="stylesheet" href="css/font-awesome.min.css" type="text/css" />
<link href='https://fonts.googleapis.com/css?family=Open+Sans:400,300,600,600italic,400italic,800,700' rel='stylesheet' type='text/css'>
<link href='https://fonts.googleapis.com/css?family=Oswald:400,700,300' rel='stylesheet' type='text/css'>
<!-- Latest compiled and minified CSS -->
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css">
<style>
.chart-container {
background-color: white;
margin-top: 5px;
margin-bottom: 5px;
padding-top: 5px;
padding-bottom: 5px;
border-radius:8px;
}
</style>

</head>
<body>

<!-- \\ Begin Holder \\ -->
<div class="DesignHolder">
<!-- \\ Begin Frame \\ -->
<div class="LayoutFrame">
<!-- \\ Begin Header \\ -->
<header>
<div class="Center">
<div id="mobile_sec">
<div class="mobile"><i class="fa fa-bars"></i><i class="fa fa-times"></i></div>
<div class="menumobile">
<!-- \\ Begin Navigation \\ -->
<nav class="Navigation">
<ul>
<li class="active">
<a href="#home">Home</a>
<span class="menu-item-bg"></span>
</li>
<li>
<a href="#about">About</a>
<span class="menu-item-bg"></span>
</li>
<li>
<a href="#services">Per Tahun</a>
<span class="menu-item-bg"></span>
</li>
<li>
<a href="#pricing">Peta ASEAN</a>
<span class="menu-item-bg"></span>
</li>
<li>
<a href="#contact">Per Negara</a>
<span class="menu-item-bg"></span>
</li>
</ul>
</nav>
<!-- // End Navigation // -->
</div>
</div>
<div class="clear"></div>
</div>
</header>
<!-- // End Header // -->
<!-- \\ Begin Banner Section \\ -->
<div class="Banner_sec" id="home">
<!-- \\ Begin banner Side -->
<div class="bannerside">
<div class="Center">
<!-- \\ Begin Left Side -->
<div class="leftside">
<h3>
<span>ASEAN Internet Growth</span>
</h3>
<br> </br>
<a href="#about">MORE DETAILS</a>
</div>
<!-- // End Left Side // -->
<!-- \\ Begin Right Side -->
<div class="rightside">
<ul id="slider">
<li>
<div class="Slider">
<figure><img src="img/using-internet1.jpg" alt="image"></figure>
</div>
</li>
<li>
<div class="Slider">
<figure><img src="img/using-internet2.jpg" alt="image"></figure>
</div>
</li>
</ul>
<figure><img src="img/Shadow-img.png" alt="image" class="Shadow"></figure>
</div>
<!-- // End Right Side // -->
</div>
</div>
<!-- // End banner Side // -->
<div class="clear"></div>
</div>
<!-- // End Banner Section // -->
<div class="bgcolor"></div>
<!-- \\ Begin Container \\ -->
<div id="Container">

<!-- \\ Begin About Section \\ -->
<div class="About_sec" id="about">
<div class="Center">
<h2>About Us</h2>
<br> </br>
<h3>
<span>
<br> Francisco Kenandi (13515140) </br>
<br> Priska Reysa (18215001) </br>
</span>
</h3>
<br> </br>
<div class="Line"></div>
<div class="Description">
<h4>
<span>
<br> Tugas Seleksi Asisten Basdat </br>
<br> Kelompok DV1 </br>
<span>
</h4>
</div>
</div>
</div>
</div>
</div>
<!-- // End About Section // -->

<!-- \\ Begin Per Tahun Section \\ -->
<div class="Services_sec" id="services">
<div class="Center">
<h2>Pengguna per Tahun</h2>
<!-- MODAL CHARTS -->
<!-- Modal -->
<div class="modal fade" id="Modal2014" role="dialog">
<div class="modal-dialog">

<!-- Modal content-->
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal">&times;</button>
<h4 class="modal-title"></h4>
</div>
<div class="modal-body">
<canvas id="bar-chartcanvas2014"></canvas>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
</div>
</div>

</div>
</div>

<div class="modal fade" id="Modal2015" role="dialog">
<div class="modal-dialog">

<!-- Modal content-->
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal">&times;</button>
<h4 class="modal-title"></h4>
</div>
<div class="modal-body">
<canvas id="bar-chartcanvas2015"></canvas>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
</div>
</div>

</div>
</div>

<div class="modal fade" id="Modal2016" role="dialog">
<div class="modal-dialog">

<!-- Modal content-->
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal">&times;</button>
<h4 class="modal-title"></h4>
</div>
<div class="modal-body">
<canvas id="bar-chartcanvas2016"></canvas>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
</div>
</div>

</div>
</div>
<!-- END MODAL CHARTS -->
<!-- \\ Begin Per Tahun Side \\ -->
<div class="Serviceside">
<ul>
<li class="Development"><a class="btn btn-link btn-lg" data-toggle="modal" data-target="#Modal2014"><h4>2014</h4></a></li>
<li class="Desdin"><a class="btn btn-link btn-lg" data-toggle="modal" data-target="#Modal2015"><h4>2015</h4></a></li>
<li class="Concept"><a class="btn btn-link btn-lg" data-toggle="modal" data-target="#Modal2016"><h4>2016</h4></a></li>
</ul>
</div>
<!-- // End Per Tahun Side // -->
</div>
</div>
<!-- // End Per Tahun Section // -->

<!-- \\ Begin Peta ASEAN Section \\ -->
<div class="Pricing_sec" id="pricing">
<div class="Center">
<h2>Peta ASEAN</h2>


<!-- PETA ASEAN SECTION-->
<div id="peta" class="asean">
<!-- Peta ASEAN -->
</div>
<h3 id="nama-negara"></h3>
<!-- END OF PETA ASEAN SECTION -->

</div>
</div>
<!-- // End Peta ASEAN Section // -->

<!-- \\ Begin Per Negara Section \\ -->
<div class="Contact_sec" id="contact">
<div class="Contactside">
<div class="Center">
<h2>per negara</h2>
<br> </br>
<div class="chart-container">
<canvas id="line-chartcanvas-malaysia" class="malaysia"></canvas>
<canvas id="line-chartcanvas-indonesia" class="indonesia" ></canvas>
<canvas id="line-chartcanvas-kamboja" class="kamboja"></canvas>
<canvas id="line-chartcanvas-brunei" class="brunei"></canvas>
<canvas id="line-chartcanvas-laos" class="laos"></canvas>
<canvas id="line-chartcanvas-singapura" class="singapura"></canvas>
<canvas id="line-chartcanvas-vietnam" class="vietnam"></canvas>
<canvas id="line-chartcanvas-thailand" class="thailand"></canvas>
<canvas id="line-chartcanvas-myanmar" class="myanmar"></canvas>
<canvas id="line-chartcanvas-filipina" class="filipina"></canvas>

</div>

</div>

</div>
</div>
<!-- // End Per Negara Section // -->

</div>
<!-- // End Container // -->

<div id="loader-wrapper">
<div id="loader"></div>

<div class="loader-section section-left"></div>
<div class="loader-section section-right"></div>

</div>

<!-- <<Attched Javascripts>> -->
<script type="text/javascript" src="js/jquery-1.11.0.min.js"></script>
<script type="text/javascript" src="js/jquery.sudoSlider.min.js"></script>
<script type="text/javascript" src="js/global.js"></script>
<script type="text/javascript" src="javascript/Chart.min.js"></script>
<script type="text/javascript" src="javascript/data-pengguna.js"></script>
<script type="text/javascript" src="javascript/pengguna-2014.js"></script>
<script type="text/javascript" src="javascript/pengguna-2015.js"></script>
<script type="text/javascript" src="javascript/pengguna-2016.js"></script>
<!-- Latest compiled JavaScript -->
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
<script type="text/javascript" src="js/modernizr.js"></script>
<script src="javascript/raphael-min.js"></script>
<script src="javascript/peta-asean.js"></script>

<script src="javascript/pengguna-malaysia.js"></script>
<script src="javascript/pengguna-indonesia.js"></script>
<script src="javascript/pengguna-myanmar.js"></script>
<script src="javascript/pengguna-singapura.js"></script>
<script src="javascript/pengguna-thailand.js"></script>
<script src="javascript/pengguna-kamboja.js"></script>
<script src="javascript/pengguna-brunei.js"></script>
<script src="javascript/pengguna-laos.js"></script>
<script src="javascript/pengguna-vietnam.js"></script>
<script src="javascript/pengguna-filipina.js"></script>

</body>
</html>
14 changes: 14 additions & 0 deletions javascript/Chart.min.js

Large diffs are not rendered by default.

Loading