Skip to content

Commit 082dbd7

Browse files
OluwakejiOnabajoOluwakejiOnabajo
committed
Fixed the file path issue in tips page and other bugs
1 parent cb8ea87 commit 082dbd7

19 files changed

+175
-89
lines changed

‎ajaxfile.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ function test_input($text){
9292
$stmt->execute();
9393
$stmt->store_result();
9494
if($stmt->num_rows > 0 ) {
95-
echo json_encode( array("status" => 0, "message" => "oop's! This email already exist") );
95+
echo json_encode( array("status" => 0, "message" => "Oop's! This email already exist") );
9696
exit;
9797
}else{
9898

‎app/ajaxfile.php

+18-6
Original file line numberDiff line numberDiff line change
@@ -542,6 +542,7 @@ function time_Ago($time) {
542542
//SHARE TIPS
543543
if ($request == 9) {
544544
$tips_title = test_input($_POST["tips-title"]);
545+
$title_slug = preg_replace('/[^a-z0-9]+/i', '-', trim(strtolower($tips_title)));
545546
$tips_content = test_input($_POST["tips-content"]);
546547
$tips_image = test_input($_FILES['tips-image']['name']);
547548
$date_added = date("Y-m-d H:i:s");
@@ -555,23 +556,34 @@ function time_Ago($time) {
555556

556557
if ($tips_title != "" && $tips_content != "" && $tips_image != "" ) {
557558

559+
//check for duplicate
560+
$stmt = $conn->prepare("SELECT tips_title FROM tips_guides WHERE tips_title = ?");
561+
$stmt->bind_param("s", $tips_title);
562+
$stmt->execute();
563+
$stmt->store_result();
564+
if($stmt->num_rows > 0 ) {
565+
echo json_encode( array("status" => 0, "message" => "Oop's! A tip with this title already exist") );
566+
exit;
567+
}
568+
558569
$path = $_FILES["tips-image"]["name"];
559570
$extension = pathinfo($path, PATHINFO_EXTENSION);
571+
$file_name = $title_slug.'.'.$extension;
560572

561573
// image file directory
562-
$target = "images/tips/".$tips_image;
574+
$target = "../images/tips/".$file_name;
563575

564576
$file_type = array('jpeg','jpg','png', 'gif');
565-
if(!in_array($extension,$file_type)){
577+
if(!in_array(strtolower($extension),$file_type)){
566578
echo json_encode( array("status" => 0,"message" => 'Please upload a jpeg, jpg, png or gif file') );
567579
exit;
568580
}
569581

570-
$posted_by = $firstname.' '.$lastname;
571-
$stmt = $conn->prepare("INSERT INTO tips_guides (posted_by, posted_id, tips_title, tips_content, cover_image, date_added) VALUES ( ?, ?, ?, ?, ?, ?)");
572-
$stmt->bind_param("ssssss", $posted_by, $user_id, $tips_title, $tips_content, $target, $date_added);
582+
$posted_by = $firstname.' '.$lastname;
583+
$stmt = $conn->prepare("INSERT INTO tips_guides (posted_by, posted_id, tips_title, title_slug, tips_content, cover_image, date_added) VALUES ( ?, ?, ?, ?, ?, ?, ?)");
584+
$stmt->bind_param("sssssss", $posted_by, $user_id, $tips_title, $title_slug, $tips_content, $file_name, $date_added);
573585
if($stmt->execute()){
574-
$move= move_uploaded_file($_FILES['tips-image']['tmp_name'], '../'.$target);
586+
$move= move_uploaded_file($_FILES['tips-image']['tmp_name'], $target);
575587
echo json_encode( array("status" => 1, "message" => "Tips Shared Successfully!") );
576588
exit;
577589
}else{

‎app/help.php

+7-5
Original file line numberDiff line numberDiff line change
@@ -82,20 +82,22 @@
8282

8383
<div class="list-group list-group-flush">
8484

85-
<?php
85+
<?php
8686
//RESPONDER MENU
8787
if ($user_type == 'responder') {?>
8888
<a href="responder" class="list-group-item list-group-item-action">Dashbboard</a>
89-
<a href="help" class="list-group-item list-group-item-action active">Help Requests</a>
89+
<a href="help" class="list-group-item list-group-item-action">Help Requests</a>
9090
<a href="view-reports" class="list-group-item list-group-item-action">View Reports</a>
91-
<a href="Profile" class="list-group-item list-group-item-action">Profile</a>
91+
<a href="share-tips" class="list-group-item list-group-item-action active">Share Tips</a>
92+
<a href="Profile" class="list-group-item list-group-item-action active">Profile</a>
9293

9394
<?php }else{
9495
//REPORTER MENU ?>
9596
<a href="reporter" class="list-group-item list-group-item-action">Dashboard</a>
96-
<a href="help" class="list-group-item list-group-item-action active">Help me!</a>
97+
<a href="help" class="list-group-item list-group-item-action">Help Me!</a>
9798
<a href="reports" class="list-group-item list-group-item-action ">Reports</a>
98-
<a href="profile" class="list-group-item list-group-item-action">Profile</a>
99+
<a href="../tips" class="list-group-item list-group-item-action">Tips & Guides </a>
100+
<a href="profile" class="list-group-item list-group-item-action active">Profile</a>
99101
<?php } ?>
100102
</div>
101103
</div>

‎app/messages.php

+15-13
Original file line numberDiff line numberDiff line change
@@ -73,20 +73,22 @@
7373

7474

7575
<div class="list-group list-group-flush">
76-
<?php
77-
//RESPONDER MENU
78-
if ($user_type == 'responder') {?>
79-
<a href="responder" class="list-group-item list-group-item-action active">Dashbboard</a>
80-
<a href="help" class="list-group-item list-group-item-action active">Help Requests</a>
81-
<a href="view-reports" class="list-group-item list-group-item-action">View Reports</a>
82-
<a href="Profile" class="list-group-item list-group-item-action">Profile</a>
83-
84-
<?php }else{
76+
<?php
77+
//RESPONDER MENU
78+
if ($user_type == 'responder') {?>
79+
<a href="responder" class="list-group-item list-group-item-action">Dashbboard</a>
80+
<a href="help" class="list-group-item list-group-item-action">Help Requests</a>
81+
<a href="view-reports" class="list-group-item list-group-item-action">View Reports</a>
82+
<a href="share-tips" class="list-group-item list-group-item-action active">Share Tips</a>
83+
<a href="Profile" class="list-group-item list-group-item-action active">Profile</a>
84+
85+
<?php }else{
8586
//REPORTER MENU ?>
86-
<a href="reporter" class="list-group-item list-group-item-action active">Dashboard</a>
87-
<a href="help" class="list-group-item list-group-item-action">Help me!</a>
88-
<a href="reports" class="list-group-item list-group-item-action">Reports</a>
89-
<a href="profile" class="list-group-item list-group-item-action">Profile</a>
87+
<a href="reporter" class="list-group-item list-group-item-action">Dashboard</a>
88+
<a href="help" class="list-group-item list-group-item-action">Help Me!</a>
89+
<a href="reports" class="list-group-item list-group-item-action ">Reports</a>
90+
<a href="../tips" class="list-group-item list-group-item-action">Tips & Guides </a>
91+
<a href="profile" class="list-group-item list-group-item-action active">Profile</a>
9092
<?php } ?>
9193

9294
</div>

‎app/notifications.php

+15-13
Original file line numberDiff line numberDiff line change
@@ -73,20 +73,22 @@
7373

7474

7575
<div class="list-group list-group-flush">
76-
<?php
77-
//RESPONDER MENU
78-
if ($user_type == 'responder') {?>
79-
<a href="responder" class="list-group-item list-group-item-action active">Dashbboard</a>
80-
<a href="help" class="list-group-item list-group-item-action active">Help Requests</a>
81-
<a href="view-reports" class="list-group-item list-group-item-action">View Reports</a>
82-
<a href="Profile" class="list-group-item list-group-item-action">Profile</a>
83-
84-
<?php }else{
76+
<?php
77+
//RESPONDER MENU
78+
if ($user_type == 'responder') {?>
79+
<a href="responder" class="list-group-item list-group-item-action">Dashbboard</a>
80+
<a href="help" class="list-group-item list-group-item-action">Help Requests</a>
81+
<a href="view-reports" class="list-group-item list-group-item-action">View Reports</a>
82+
<a href="share-tips" class="list-group-item list-group-item-action active">Share Tips</a>
83+
<a href="Profile" class="list-group-item list-group-item-action active">Profile</a>
84+
85+
<?php }else{
8586
//REPORTER MENU ?>
86-
<a href="reporter" class="list-group-item list-group-item-action active">Dashboard</a>
87-
<a href="help" class="list-group-item list-group-item-action">Help me!</a>
88-
<a href="reports" class="list-group-item list-group-item-action">Reports</a>
89-
<a href="profile" class="list-group-item list-group-item-action">Profile</a>
87+
<a href="reporter" class="list-group-item list-group-item-action">Dashboard</a>
88+
<a href="help" class="list-group-item list-group-item-action">Help Me!</a>
89+
<a href="reports" class="list-group-item list-group-item-action ">Reports</a>
90+
<a href="../tips" class="list-group-item list-group-item-action">Tips & Guides </a>
91+
<a href="profile" class="list-group-item list-group-item-action active">Profile</a>
9092
<?php } ?>
9193
</div>
9294
</div>

‎app/profile.php

+3-1
Original file line numberDiff line numberDiff line change
@@ -76,13 +76,15 @@
7676
<a href="responder" class="list-group-item list-group-item-action">Dashbboard</a>
7777
<a href="help" class="list-group-item list-group-item-action">Help Requests</a>
7878
<a href="view-reports" class="list-group-item list-group-item-action">View Reports</a>
79+
<a href="share-tips" class="list-group-item list-group-item-action active">Share Tips</a>
7980
<a href="Profile" class="list-group-item list-group-item-action active">Profile</a>
8081

8182
<?php }else{
8283
//REPORTER MENU ?>
8384
<a href="reporter" class="list-group-item list-group-item-action">Dashboard</a>
84-
<a href="help" class="list-group-item list-group-item-action">Help me!</a>
85+
<a href="help" class="list-group-item list-group-item-action">Help Me!</a>
8586
<a href="reports" class="list-group-item list-group-item-action ">Reports</a>
87+
<a href="../tips" class="list-group-item list-group-item-action">Tips & Guides </a>
8688
<a href="profile" class="list-group-item list-group-item-action active">Profile</a>
8789
<?php } ?>
8890
</div>

‎app/reporter.php

+2-1
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,9 @@
7474

7575
<div class="list-group list-group-flush">
7676
<a href="reporter" class="list-group-item list-group-item-action active">Dashboard</a>
77-
<a href="help" class="list-group-item list-group-item-action">Help me!</a>
77+
<a href="help" class="list-group-item list-group-item-action">Help Me!</a>
7878
<a href="reports" class="list-group-item list-group-item-action">Reports</a>
79+
<a href="../tips" class="list-group-item list-group-item-action">Tips & Guides </a>
7980
<a href="profile" class="list-group-item list-group-item-action">Profile</a>
8081
</div>
8182
</div>

‎app/reports.php

+2-1
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,9 @@
7373

7474
<div class="list-group list-group-flush">
7575
<a href="reporter" class="list-group-item list-group-item-action">Dashboard</a>
76-
<a href="help" class="list-group-item list-group-item-action">Help me!</a>
76+
<a href="help" class="list-group-item list-group-item-action">Help Me!</a>
7777
<a href="reports" class="list-group-item list-group-item-action active">Reports</a>
78+
<a href="../tips" class="list-group-item list-group-item-action">Tips & Guides </a>
7879
<a href="profile" class="list-group-item list-group-item-action">Profile</a>
7980
</div>
8081
</div>

‎app/share-tips.php

+24-15
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,8 @@
6868
<div class="list-group list-group-flush">
6969
<a href="responder" class="list-group-item list-group-item-action">Dashbboard</a>
7070
<a href="help" class="list-group-item list-group-item-action">Help Requests</a>
71-
<a href="view-reports" class="list-group-item list-group-item-action active">View Reports</a>
71+
<a href="view-reports" class="list-group-item list-group-item-action">View Reports</a>
72+
<a href="share-tips" class="list-group-item list-group-item-action active">Share Tips</a>
7273
<a href="#" class="list-group-item list-group-item-action">Profile</a>
7374
</div>
7475
</div>
@@ -80,17 +81,19 @@
8081

8182
<?php include_once 'includes/navbar.php'; ?>
8283

83-
<div class="container">
84-
<div id="alert_box" style="display:none;" class="error_alert" >
85-
<span aria-label="close" onclick="close_alert('alert_box')" >&times;</span>
86-
<p><i class="fa fa-exclamation-circle"></i> <span id="alert"></span></p>
84+
<div class="container-fluid">
85+
<div class="btn-group">
86+
<a class="btn btn-success mt-3" href="../tips">View tips</a>
87+
<button class="btn btn-info mt-3" type="button" id="make-new">Add new tips</button>
8788
</div>
89+
8890
<div class="row">
8991
<div class="offset-md-1 col-md-10">
92+
93+
<div class="add-tips">
9094
<h2 class="mt-4 text-center">Share Helpful Tips</h2>
9195
<p class="text-center mb-4">Help a soul today by entering a tip below and tap the share button to submit</p>
92-
</div>
93-
</div>
96+
9497
<form action="" autocomplete="off" id="tips-form" class="form-horiontal" method="post">
9598
<div class="form-row">
9699
<div class="col-md-6 mb-3">
@@ -100,27 +103,33 @@
100103
</div>
101104
<div class="col-md-6 mb-3">
102105
<label>Cover Image</label>
103-
<input type="file" id="tips-image" class="form-control" id="custom-file" />
104-
<span class="invalid-feedback">Please upload your cover image</span>
105-
<!-- <div class="custom-file">
106+
<div class="custom-file">
106107
<input type="file" id="tips-image" class="form-control custom-file-input" id="custom-file" />
107-
<label class="custom-file-label" id="tips-image" for="custom-file">Select a cover image</label>
108+
<label class="custom-file-label" id="tips-image-name" for="custom-file">Select a cover image</label>
108109
<span class="invalid-feedback">Please upload your cover image</span>
109-
</div> -->
110+
</div>
110111
</div>
112+
</div>
113+
111114
<textarea class="form-control" placeholder="Describe your situation..." id="tips-content" rows="4" cols="3"></textarea>
112115
<div class="invalid-feedback">Please enter your tips</div>
113116

114117
<div class="col-md-12 text-center">
115-
<button class="btn btn-info btn-lg pull-left" type="button" id="share-tips" style="margin-top: 15px;">Share Tips <i class="fa fa-sign-in"></i></button>
118+
<button class="btn btn-info text-center" type="button" id="share-tips" style="margin-top: 15px;">Share Tips <i class="fa fa-sign-in"></i></button>
116119
</div>
120+
121+
</form>
117122

118123
</div>
124+
125+
126+
<div id="all-tips">
127+
128+
</div>
119129
</div>
120-
</form>
121130

122131
<!--Footer Copywright-->
123-
<div class="text-center container-fluid">
132+
<div class="text-right container-fluid">
124133
<div class="credits">
125134
Copyright &copy;<script>document.write(new Date().getFullYear());</script> All rights reserved | SpeakUp
126135
</div>

‎images/tips/ggggggggggggggg.png

336 KB
Loading

‎images/tips/tips-image1.jpg

-146 KB
Binary file not shown.

‎images/tips/tips-image2.jpg

-38.4 KB
Binary file not shown.

‎images/tips/tips-image3.jpg

-37 KB
Binary file not shown.

‎images/tips/tips-image4.jpg

-36.7 KB
Binary file not shown.

‎index.php

+18-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
<?php
2+
include_once 'functions.php';
3+
$login = '';
4+
5+
if (isset($_SESSION['user_id']) && isset($_SESSION['user_type'])) {
6+
$user_id = preg_replace('#[^0-9]#','',$_SESSION['user_id']);
7+
$user_type = test_input($_SESSION["user_type"]);
8+
$login = true;
9+
}
10+
?>
11+
112
<!DOCTYPE html>
213
<html lang="en">
314
<head>
@@ -47,12 +58,18 @@
4758
<li class="nav-item">
4859
<a href="#frequently-question" class="nav-link smoothScroll">FAQ's</a>
4960
</li>
61+
<?php if(!$login){ ?>
5062
<li class="nav-item">
5163
<a href="signup" class="nav-link">Signup</a>
5264
</li>
5365
<li class="nav-item">
5466
<a href="login" class="nav-link login">Login</a>
5567
</li>
68+
<?php }else{ ?>
69+
<li class="nav-item">
70+
<a href="app/logout" class="nav-link login">Logout</a>
71+
</li>
72+
<?php } ?>
5673
</ul>
5774
</div>
5875
</div>
@@ -452,7 +469,7 @@
452469

453470
<div class="row">
454471
<div class="text-center col-md-12 col-12" >
455-
<p class="copyright-text">Copyright &copy; <script>document.write(new Date().getFullYear());</script> Campus Intel
472+
<p class="copyright-text">Copyright &copy; <script>document.write(new Date().getFullYear());</script> SpeakUp
456473
<br>Design: Inventor Build For SGD Team 004</p>
457474
</div>
458475

‎js/app.js

+10-3
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,13 @@ $("#update-profile").click(function(){
128128
$(this).next('.custom-file-label').html(files.join(', '));
129129
});
130130

131+
$("#tips-image").on('change', function() {
132+
var image_name = $(this)[0].value;
133+
var split_image_name = image_name.split('\\');
134+
var image_name = split_image_name[2];
135+
$("#tips-image-name").text(image_name);
136+
});
137+
131138
//SUBMIT REPORT
132139
$("#report").click(function(){
133140
var title = $("#report-title").val();
@@ -239,18 +246,18 @@ $("#update-profile").click(function(){
239246
processData: false,
240247
dataType: 'json',
241248
beforeSend: function(){
242-
document.getElementById("share-tips").innerHTML='<img src="../images/loading.gif" width="20px" height="20px"> Processing';
249+
document.getElementById("share-tips").innerHTML='<img src="../images/loading.gif" width="10px" height="10px"> Processing';
243250
document.getElementById("share-tips").disable='true';
244251
},
245252
success:function(response){
246253
if(response.status == 1){
247-
console.log("sucess");
248-
document.getElementById("tips-form").reset();
254+
249255
document.getElementById("tips-form").reset();
250256
document.getElementById("alert_box").style.display="none";
251257
document.getElementById("alert").innerHTML='';
252258

253259
$('#tips-success').modal('show');
260+
$("#tips-image-name").text("Select a cover image");
254261
document.getElementById("success_text").innerHTML=response.message;
255262

256263
}else{

‎signup.php

+19-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
<?php
2+
include_once 'functions.php';
3+
$login = '';
4+
5+
if (isset($_SESSION['user_id']) && isset($_SESSION['user_type'])) {
6+
$user_id = preg_replace('#[^0-9]#','',$_SESSION['user_id']);
7+
$user_type = test_input($_SESSION["user_type"]);
8+
$login = true;
9+
}
10+
?>
11+
112
<!DOCTYPE html>
213
<html lang="en" class="body-full-height">
314
<head>
@@ -46,12 +57,18 @@
4657
<li class="nav-item">
4758
<a href="home#frequently-question" class="nav-link smoothScroll">FAQ's</a>
4859
</li>
60+
<?php if(!$login){ ?>
4961
<li class="nav-item">
50-
<a href="signup" class="nav-link active">Signup</a>
62+
<a href="signup" class="nav-link">Signup</a>
5163
</li>
5264
<li class="nav-item">
5365
<a href="login" class="nav-link login">Login</a>
5466
</li>
67+
<?php }else{ ?>
68+
<li class="nav-item">
69+
<a href="app/logout" class="nav-link login">Logout</a>
70+
</li>
71+
<?php } ?>
5572
</ul>
5673
</div>
5774
</div>
@@ -501,7 +518,7 @@
501518

502519
<div class="row">
503520
<div class="text-center col-md-12 col-12" >
504-
<p class="copyright-text">Copyright &copy; <script>document.write(new Date().getFullYear());</script> Campus Intel
521+
<p class="copyright-text">Copyright &copy; <script>document.write(new Date().getFullYear());</script> SpeakUp
505522
<br>Design: Inventor Build For SGD Team 004</p>
506523
</div>
507524

0 commit comments

Comments
 (0)