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

Tubes 3 - Ranger Enemy #60

Open
wants to merge 111 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
111 commits
Select commit Hold shift + click to select a range
c5ae16e
Kerangka Dashboard
edwardsamuel Feb 16, 2013
27d21b8
Halaman profile v0.1 dan antek-anteknya
abrahamks Feb 16, 2013
4a550dd
halaman pembuatan tugas v0.1
abrahamks Feb 20, 2013
5d9e1b8
CSS + javascript create tugas
abrahamks Feb 20, 2013
1db67a1
Halaman Dashboard + Rincian Tugas
edwardsamuel Feb 20, 2013
6ffbb53
Halaman Utama (dengan CSS+JS)
sthobis Feb 20, 2013
1aaffef
Update src/default.css
abrahamks Feb 22, 2013
6dd1e1d
createtugas.html FINAL
abrahamks Feb 22, 2013
166450c
index.js + index.css
sthobis Feb 22, 2013
6071344
mediaqueries.css v0.2
abrahamks Feb 22, 2013
81f7568
Merge branch 'master' of https://github.com/edwardsamuel/IF3038-2013
abrahamks Feb 22, 2013
f96da80
Update index.html
sthobis Feb 22, 2013
9079c7b
dashboard.html --> penyelesaian modul
edwardsamuel Feb 22, 2013
9fca188
mediaqueries.css final
abrahamks Feb 22, 2013
c99cdad
Validasi dengan validator.w3.org dan Perbaikan Minor
edwardsamuel Feb 22, 2013
d0d41df
mediaqueries.css FINAL 720pz
abrahamks Feb 22, 2013
fe099b8
Validasi Registrasi dan Penambahan MEMBER.md
edwardsamuel Feb 22, 2013
d8a3c46
Merge branch 'master' of https://github.com/edwardsamuel/IF3038-2013
edwardsamuel Feb 22, 2013
b852516
Update form login index.html
sthobis Feb 22, 2013
b4f00df
Merge branch 'master' of https://github.com/edwardsamuel/IF3038-2013
sthobis Feb 22, 2013
e7becd1
Update index.js (validasi login)
sthobis Feb 22, 2013
a33d64b
mediaqueries.css 320px v0.1
abrahamks Feb 22, 2013
58fd42f
Upload image index.html
sthobis Feb 22, 2013
4d77fac
Update index.html index.css (image deskripsi website)
sthobis Feb 22, 2013
b59f286
Merge branch 'master' of https://github.com/edwardsamuel/IF3038-2013
abrahamks Feb 22, 2013
59025c5
Datetimepicker
edwardsamuel Feb 22, 2013
daad0a3
Merge branch 'master' of https://github.com/edwardsamuel/IF3038-2013
abrahamks Feb 22, 2013
a0707d4
Perbaikan Minor
edwardsamuel Feb 22, 2013
e35a650
Final
edwardsamuel Feb 22, 2013
9c387b7
ganti member, mulai tubes 2
wilsonf Mar 7, 2013
12c4b35
prototype database
wilsonf Mar 7, 2013
76550ff
Perbaikan dari Tubes 1
edwardsamuel Mar 9, 2013
d61ce4c
Migrasi ke PHP + Pembuatan Halaman index.php + Perbaikan pada SQL
edwardsamuel Mar 12, 2013
b36e262
perubahan :
wilsonf Mar 13, 2013
8e6b0bc
Penambahan Header/Footer yang terpisah + Penambahan Fungsi ajax
edwardsamuel Mar 14, 2013
a14993b
Merge branch 'tubes2' of https://github.com/edwardsamuel/IF3038-2013 …
edwardsamuel Mar 14, 2013
a9a3621
Pembuatan profile.php + minor update default.css
13510039 Mar 14, 2013
74a1afc
Pembuatan halaman dashboard
wilsonf Mar 14, 2013
248ce7f
Perbaikan Basis Data
edwardsamuel Mar 16, 2013
c8a650b
Perbaikan Basis Data + Penyelesaian index.php + Perbaikan models/tuga…
edwardsamuel Mar 16, 2013
b1c323c
penyesuaian dengan perubahan sql dan penambahan fungsi mengubah status
wilsonf Mar 17, 2013
60de6b8
halaman penambahan tugas sudah tersambung dengan sql
wilsonf Mar 19, 2013
28ce6f5
penambahan fungsional tombol delete kategori
wilsonf Mar 19, 2013
fabc483
penambahan halaman profile, query belum benar karena akan ada perubah…
13510039 Mar 20, 2013
7949966
penambahan method update pada user.php
13510039 Mar 20, 2013
d5f21f0
finishing dashboard
wilsonf Mar 20, 2013
4384f9d
Merge branch 'tubes2' of https://github.com/edwardsamuel/IF3038-2013 …
13510039 Mar 20, 2013
3fa4dfb
Restore Basis Data
edwardsamuel Mar 20, 2013
f31e29f
pembetulan basis data dan peyelesaian dashboard
wilsonf Mar 20, 2013
2a3c5ef
Penambahan Halaman Detail Tugas
edwardsamuel Mar 20, 2013
2f739cb
Perbaikan Dashboard
edwardsamuel Mar 20, 2013
9dc8628
Perubahan Minor Basis Data + Halaman Rincian Tugas agar compatible de…
edwardsamuel Mar 20, 2013
0b60bb0
impleentasi fungsional pembuatan tugas baru
wilsonf Mar 20, 2013
18e5294
Merge branch 'tubes2' of https://github.com/edwardsamuel/IF3038-2013 …
wilsonf Mar 20, 2013
d7f1d23
Halaman Detail Tugas degan AJAX
edwardsamuel Mar 21, 2013
21e423c
Merge branch 'tubes2' of https://github.com/edwardsamuel/IF3038-2013 …
edwardsamuel Mar 21, 2013
da334da
penambahan fungsional delete tugas oleh pemilik
wilsonf Mar 21, 2013
0a621f3
Merge branch 'tubes2' of https://github.com/edwardsamuel/IF3038-2013 …
wilsonf Mar 21, 2013
8b30191
Komentar pada Rincian Tugas
edwardsamuel Mar 21, 2013
cb0478c
penambahan session user pada dashboard.php agar bisa dilakukan penget…
wilsonf Mar 21, 2013
9e0d2a6
Merge branch 'tubes2' of https://github.com/edwardsamuel/IF3038-2013 …
wilsonf Mar 21, 2013
78c8982
pembenaran show kategori pada saat membuat tugas baru
wilsonf Mar 21, 2013
ae4869a
pembetulan terhadap ajax/kategori.php
wilsonf Mar 21, 2013
1d64467
pembenaran terhadap createkategori.php
wilsonf Mar 21, 2013
06674e5
Perbaikan Halaman Register + Rincian Tugas
edwardsamuel Mar 22, 2013
4f48096
Merge branch 'tubes2' of https://github.com/edwardsamuel/IF3038-2013 …
edwardsamuel Mar 22, 2013
c895e96
sinkronisasi basisdata dan perbaikan rincian tugas
edwardsamuel Mar 22, 2013
3cc54d6
Perbaikan Minor createtugas.php
edwardsamuel Mar 22, 2013
d73e4fd
penampilan kategori bila hanya menjadi assignee
wilsonf Mar 22, 2013
157dc4f
pengubahan header halaman dashboard dan createtugas
wilsonf Mar 22, 2013
36d934d
Final Rincian Tugas
edwardsamuel Mar 23, 2013
3ab0d03
Penghapusab create.php
edwardsamuel Mar 23, 2013
777bd8e
Merge branch 'tubes2' of https://github.com/edwardsamuel/IF3038-2013 …
edwardsamuel Mar 23, 2013
d9189e8
Perbaikan mediaqueries.css + Minor dashboard.js
edwardsamuel Mar 23, 2013
f54b133
finishing Profile dan search.
13510039 Mar 23, 2013
dbe5263
Merge branch 'tubes2' of https://github.com/edwardsamuel/IF3038-2013 …
edwardsamuel Mar 23, 2013
14b8be3
Perbaikan Bug
13510039 Mar 23, 2013
2d733c2
Perbaikan Bug pada profilecategory.php
13510039 Mar 23, 2013
60de754
Mulai Tubes 3 + Struktur Dasar + Halaman Index
edwardsamuel Apr 4, 2013
fb1948b
penambahan library
wilsonf Apr 4, 2013
a9d8f91
mulai pengerjaan dashboard
wilsonf Apr 4, 2013
96fe02e
Penambahan Connector MySQL + Pembuatan JSON Writer + Perbaikan .gitig…
edwardsamuel Apr 4, 2013
df2f894
penambahan dashboard awal
wilsonf Apr 4, 2013
c637f7d
Pelengkapan DetilTugas + Pembuatan UpdateTugas + Penambahan Konstrukt…
edwardsamuel Apr 5, 2013
2c3bb72
pembenaran header dan dashboard
wilsonf Apr 5, 2013
00e1c7b
Merge branch 'tubes3' of https://github.com/edwardsamuel/IF3038-2013 …
13510039 Apr 5, 2013
b043825
penyelesaian halaman dashboard
wilsonf Apr 7, 2013
2271876
Perbaikan JSON + Updater Tugas + View Tugas + Perbaikan Register
edwardsamuel Apr 7, 2013
bbe6795
Merge branch 'tubes3' of https://github.com/edwardsamuel/IF3038-2013 …
edwardsamuel Apr 7, 2013
a40e941
Perbaikan Header + Penyelesaian Detil Tugas + Penyesuaian File Berkaitan
edwardsamuel Apr 7, 2013
9f588f4
menyelesaikan halaman dashboard dan create tugas
wilsonf Apr 9, 2013
c034f83
profile (-upload avatar) dan search (belum selesai)
13510039 Apr 10, 2013
99d56c4
profile ( - upload avatar ) dan search (belum selesai)
13510039 Apr 10, 2013
9f37411
Merge branch 'tubes3' of https://github.com/edwardsamuel/IF3038-2013 …
13510039 Apr 10, 2013
294f2a5
finalisasi profile
13510039 Apr 10, 2013
deaa80c
fix bug header, updating search(belum sempurna), profile belum sempurna
13510039 Apr 10, 2013
33fd054
pembetulan create tugas saat tidak ada file yang diupload
wilsonf Apr 11, 2013
d0b1c3d
Penyempurnaan profile, penyempurnaan search
13510039 Apr 11, 2013
53dfc0e
Merge branch 'tubes3' of https://github.com/edwardsamuel/IF3038-2013 …
13510039 Apr 11, 2013
0edff2c
perbaikan bug search
13510039 Apr 11, 2013
c8354e0
autocomplete search dan search berdasarkan tag
13510039 Apr 11, 2013
f1e6758
autocomplete search dan search berdasarkan tag (Not Versioned Files)
13510039 Apr 11, 2013
f22c600
perbaikan bug minor pada search
13510039 Apr 11, 2013
bf67b76
minor bug pada profile dan search
13510039 Apr 12, 2013
c4c2e33
Perbaikan minor Autocomplete
edwardsamuel Apr 12, 2013
ccef49e
pembetulan dashboard
wilsonf Apr 12, 2013
f670f56
Merge branch 'tubes3' of https://github.com/edwardsamuel/IF3038-2013 …
wilsonf Apr 12, 2013
70e73a1
pembetulan
wilsonf Apr 12, 2013
43b859f
fix bug href assignee pada rincianTugas
13510039 Apr 13, 2013
0012c13
pengubahan database properties sesuai spek progin_471_13510039
13510039 Apr 13, 2013
ccae927
penambahan file progin_471_13510039.sql
13510039 Apr 13, 2013
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
Prev Previous commit
Next Next commit
Final
edwardsamuel committed Feb 22, 2013
commit e35a6500266bbef38789291e451395a4c710690b
3 changes: 1 addition & 2 deletions src/createtugas.html
Original file line number Diff line number Diff line change
@@ -80,10 +80,9 @@ <h1>Buat Tugas Baru</h1>
</div>
</div>
<footer class="content">
This website is created solely for the purpose of fulfilling our college task.</br>
This website is created solely for the purpose of fulfilling our college task.<br />
IF3094 - Pemrograman Internet.
</footer>
</div>

</body>
</html>
4 changes: 0 additions & 4 deletions src/index.css
Original file line number Diff line number Diff line change
@@ -119,10 +119,6 @@ footer {
color: #FFFFFF;
font-size: 70%;
}
<<<<<<< HEAD

=======
>>>>>>> 58fd42f9e09e7f20b723c18d6fd80dd322b6c801
button, .button {
display: inline-block;
background-color: #78c368;
8 changes: 4 additions & 4 deletions src/index.html
Original file line number Diff line number Diff line change
@@ -37,7 +37,7 @@
<h1>So How Does Our System Work? </h1>
Let's see the brief explanation from these video below..
<div id="slider">
<div><img src="images/image-1.jpg" id="slide" name="slider_picture"></div>
<div><img src="images/image-1.jpg" id="slide" alt="" /></div>
<button onclick="back()" class="slider_button">Back</button>
<button onclick="next()" class="slider_button">Next</button>
</div>
@@ -66,13 +66,13 @@ <h1>Register Now!</h1>
<input type="email" class="regbox" id="email" name="email" placeholder="Your Email.." required="required" onkeyup="validateEmail();" onchange="validateEmail();" />
</div>
<div class="wrapper">
<input type="text" class="regbox" id="bday" name="bday" required="required" placeholder="Birthday (yyyy-mm-dd)" /><a href="javascript:NewCal('bday','yyyymmdd')"><img src="images/cal.gif" width="16" height="16" border="0" alt="Pick a date"></a>
<input type="text" class="regbox" id="bday" name="bday" required="required" placeholder="Birthday (dd-mm-yyyy)" onkeyup="validateBday();" onchange="validateBday();" /><a href="#" onclick="return bdayPicker();"><img src="images/cal.gif" width="16" height="16" border="0" alt="Pick a date"></a>
</div>
<div class="wrapper">
<p class="regtext">Profile Image:<br /></p><input type="file" id="ava" name="ava" accept="image/*" required="required" />
<p class="regtext">Profile Image:<br /></p><input type="file" id="ava" name="ava" accept="image/*" required="required" onkeyup="validateAvatar();" onchange="validateAvatar();" />
</div>
<p>By clicking Sign Up, you agree to our Terms and that you have read our Data Use Policy, including our Cookie Use. </p>
<input type="submit" class="button" id="register" onclick="register()" value="Sign Up" />
<input type="submit" class="button" id="register" onclick="register()" value="Sign Up" disabled="true" />
</form>
</div>
</div>
5 changes: 5 additions & 0 deletions src/nbproject/private/private.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
copy.src.files=false
copy.src.target=
index.file=index.php
run.as=LOCAL
url=http://localhost/Progin-1/
4 changes: 4 additions & 0 deletions src/nbproject/private/private.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<project-private xmlns="http://www.netbeans.org/ns/project-private/1">
<editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/2" lastBookmarkId="0"/>
</project-private>
7 changes: 7 additions & 0 deletions src/nbproject/project.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
include.path=${php.global.include.path}
php.version=PHP_54
source.encoding=UTF-8
src.dir=.
tags.asp=false
tags.short=true
web.root=.
9 changes: 9 additions & 0 deletions src/nbproject/project.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://www.netbeans.org/ns/project/1">
<type>org.netbeans.modules.php.project</type>
<configuration>
<data xmlns="http://www.netbeans.org/ns/php-project/1">
<name>Progin-1</name>
</data>
</configuration>
</project>
56 changes: 54 additions & 2 deletions src/scripts/index.js
Original file line number Diff line number Diff line change
@@ -31,9 +31,9 @@ function back()
function changeRegister() {
var registerBtn = document.getElementById("register");
if (isValidUname && isValidPassword && isValidRePassword && isValidFullName && isValidEmail && isValidBday && isValidPhoto) {
registerBtn.enabled = 'true';
registerBtn.disabled = 'false';
} else {
registerBtn.enabled = 'false';
registerBtn.disabled = 'true';
}
}

@@ -144,6 +144,54 @@ function validateEmail() {
changeRegister();
}


function validateBday() {
var bday = document.getElementById("bday");
var regex = /^[0-9]{1,2}-[0-9]{1,2}-[0-9]{4,4}$/g;

isValidBday = true;
if (!regex.test(bday.value)) {
isValidBday = false;
}

if (isValidBday) {
if (bday.value.substr(bday.value.length - 4) < 1955) {
isValidBday = false;
}
}

if (isValidBday) {
bday.style.border = '2px #5fae53 solid';
} else {
bday.style.border = '2px red solid';
}

changeRegister();
}

function validateAvatar() {
var xAvatar = document.getElementById("ava");
var str1=/\.jpg/g;
var str2=/\.jpeg/g;

isValidPhoto = true;

if (!str1.test(xAvatar.value) && !str2.test(xAvatar.value)) {
isValidPhoto = false;
}

if (isValidPhoto) {
xAvatar.style.border = '2px #5fae53 solid';
} else {
xAvatar.style.border = '2px red solid';
}
}

function bdayPicker() {
NewCal('bday','ddmmyyyy');
return false;
}

function validateLogin()
{
var xUsername=document.forms["login"]["uname"].value;
@@ -231,4 +279,8 @@ function validateForm()
return false;
}
}
}

function register() {
window.location.replace("dashboard.html");
}