Skip to content

Commit 241c365

Browse files
authored
Merge pull request #288 from BCarter04/main
Code_clean_up
2 parents 792dc5a + 8a486b7 commit 241c365

File tree

9 files changed

+184
-67
lines changed

9 files changed

+184
-67
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"githubPullRequests.ignoredPullRequestBranches": [
3+
"main"
4+
]
5+
}

SYSTEM MANAGEMENT APPS/Bookstore management/MiniProject/MiniProject/dashboard.php

+2-25
Original file line numberDiff line numberDiff line change
@@ -76,20 +76,6 @@
7676
</div>
7777
<div class="col"></div>
7878
</div>
79-
<!-- <ul class="nav nav-pills nav-fill">
80-
<li class="nav-item" >
81-
<a class="nav-link fragment-nav-link" id="internship-fragment" style="border-left: 1px solid rgb(221, 221, 221); background-color:#3d4755; color:white;" href="index.php">Internships</a>
82-
</li>
83-
84-
<li class="nav-item">
85-
<a class="nav-link fragment-nav-link" id="mj-fragment" style="border-left: 1px solid rgb(221, 221, 221);" href="indexmicrojobs.php">Micro-Jobs</a>
86-
</li>
87-
88-
<li class="nav-item">
89-
<a class="nav-link fragment-nav-link" id="ft-fragment" href="indexfulltime.php" style="border-left: 1px solid rgb(221, 221, 221); border-right: 1px solid rgb(221, 221, 221);">Full-Time Internships</a>
90-
</li>
91-
https://www.youtube.com/watch?v=XfobCv4YBdk
92-
</ul> -->
9379
</div>
9480

9581
<br><br>
@@ -155,11 +141,7 @@
155141
?>
156142

157143
</div>
158-
<!-- <div class="col">
159-
<button class="btn btn-danger know-more-btn" type="button" data-bs-toggle="collapse" data-bs-target="#my<?=$idnum?>" aria-expanded="false" aria-controls="collapseExample">
160-
View Details
161-
</button>
162-
</div> -->
144+
163145
</div>
164146
<div class="row">
165147
<div class="col">
@@ -187,12 +169,7 @@
187169
<p class="jobdetails"><?=$books['description']?></p>
188170
<strong><p class="jobdetails">Author:</p></strong>
189171
<p class="jobdetails"><?=$books['book_author']?></p>
190-
<!-- <strong><p class="jobdetails">Admin:</p></strong>
191-
<div class="row">
192-
<div class="col"><p class="jobdetails">Name: Zion</p></div>
193-
<div class="col">Mobile Number: 9985632698</div>
194-
<div class="col">Address: 29 Floor, Orchid Inc, Mumbai Central</div>
195-
</div> -->
172+
196173
</div>
197174
<div class="row">
198175

SYSTEM MANAGEMENT APPS/Bookstore management/MiniProject/MiniProject/headermenu.php

+2-1
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
if(!isset($_COOKIE["email"])){
4040
?>
4141
<a class="nav-link" id="login-link" href="login.php" aria-current="page">Login</a>
42+
<a class="nav-link" id="login-link" href="signin.php" aria-current="page">Register</a>
4243

4344
<?php
4445
}
@@ -49,7 +50,7 @@
4950
<?=$_COOKIE['email']?>
5051
</a>
5152
<ul class="dropdown-menu" aria-labelledby="navbarDropdownMenuLink">
52-
<li><a class="dropdown-item" id="profile-link" href="#">Profile</a></li>
53+
<li><a class="dropdown-item" id="profile-link" href="profile.php">Profile</a></li>
5354
<li>
5455
<form method="post">
5556
<input name="logout" type="hidden" value="logout">

SYSTEM MANAGEMENT APPS/Bookstore management/MiniProject/MiniProject/index.php

+2-15
Original file line numberDiff line numberDiff line change
@@ -86,19 +86,6 @@
8686
</form>
8787

8888
</div>
89-
<!-- <ul class="nav nav-pills nav-fill">
90-
<li class="nav-item" >
91-
<a class="nav-link fragment-nav-link" id="internship-fragment" style="border-left: 1px solid rgb(221, 221, 221); background-color:#3d4755; color:white;" href="index.php">Internships</a>
92-
</li>
93-
94-
<li class="nav-item">
95-
<a class="nav-link fragment-nav-link" id="mj-fragment" style="border-left: 1px solid rgb(221, 221, 221);" href="indexmicrojobs.php">Micro-Jobs</a>
96-
</li>
97-
98-
<li class="nav-item">
99-
<a class="nav-link fragment-nav-link" id="ft-fragment" href="indexfulltime.php" style="border-left: 1px solid rgb(221, 221, 221); border-right: 1px solid rgb(221, 221, 221);">Full-Time Internships</a>
100-
</li>
101-
</ul> -->
10289
</div>
10390

10491
<br><br>
@@ -288,7 +275,7 @@
288275
}
289276
else{
290277
?>
291-
<p class="part-time-job"><?=$books['availability']?></p>
278+
<p class="part-time-job"><del><?=$books['availability']?></del></p>
292279
<?php
293280
}
294281
?>
@@ -303,7 +290,7 @@
303290
}
304291
else{
305292
?>
306-
<p class="micro-job">Rs: <?=$books['price']?></p>
293+
<p class="micro-job">&#x20AC;: <?=$books['price']?></p>
307294
<?php
308295
}
309296
?>

SYSTEM MANAGEMENT APPS/Bookstore management/MiniProject/MiniProject/js/authprocessing.js

+3-2
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,9 @@ var iti = window.intlTelInput(input, {
6767
// console.log(iti.isValidNumber());
6868

6969
$("#reg-btn").click(function(){
70-
var mobilenumber,email,pass,repass;
71-
70+
var mobilenumber,email,pass,repass,fname;
71+
72+
fname = $("#fname-input-reg").val()
7273
mobilenumber = $("#mobile-input-reg").val()
7374
email = $("#email-input-reg").val()
7475
pass = $("#password-input-reg").val()

SYSTEM MANAGEMENT APPS/Bookstore management/MiniProject/MiniProject/login.php

-4
Original file line numberDiff line numberDiff line change
@@ -112,10 +112,6 @@
112112
</head>
113113

114114
<body class="bg-1">
115-
<!-- <br><br>
116-
<div class="container head-msg">
117-
<h1 class="display-5">Welcome To ADC-Internship</h1>
118-
</div> -->
119115

120116

121117

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,165 @@
1+
<?php
2+
if(!isset($_COOKIE["email"])){
3+
header('Location: login.php');
4+
}
5+
require_once "connection.php";
6+
error_reporting(0);
7+
// if($_POST['keywords']){
8+
9+
$query = $link->prepare('SELECT * FROM `users` WHERE `email` = (?)');
10+
$query -> bind_param("s", $_COOKIE['email']);
11+
$query->execute();
12+
$res = $query->get_result();
13+
$row = mysqli_fetch_array($res);
14+
$uid = $row['user_id'];
15+
16+
// $bookname = $_POST['bookname'];
17+
// $status = $_POST['status'];
18+
// $price = $_POST['price'];
19+
// $desc =$_POST['decs'];
20+
// $author = $_POST['author'];
21+
// $condition = $_POST['condition'];
22+
// $keywords = $_POST['keywords'];
23+
24+
// $name = $_FILES['thumbnail']['name'];
25+
// $type = $_FILES['thumbnail']['type'];
26+
// $image = addslashes(file_get_contents($_FILES['image']['tmp_name']));
27+
// echo $uid;
28+
// echo $bookname;
29+
// echo $status;
30+
// echo $price;
31+
// echo $desc;
32+
// echo $author;
33+
// echo $condition;
34+
// echo $keywords;
35+
// print_r($_FILES['thumbnail']);
36+
// $image = addslashes(file_get_contents($_FILES['thumbnail']['tmp_name']));
37+
38+
// $queryupload = $link->prepare('INSERT INTO `books` (`user_id`, `book_title`, `image`, `availability`, `price`, `description`, `book_author`, `book_condition`, `keywords`) VALUES (?,?,"' . $image . '",?,?,?,?,?,?)');
39+
40+
// $queryupload->bind_param("isssssss",$uid,$bookname,$status,$price,$desc,$author,$condition,$keywords);
41+
42+
// if ($queryupload->execute()) {
43+
// header("Location: dashboard.php");
44+
// $msg = '<div class="alert alert-success alert-dismissible fade show" role="alert"><strong>Hurray! </strong>New Book Uploaded Successfully.<button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button></div>';
45+
// }
46+
// else {
47+
// $msg = '<div class="alert alert-danger alert-dismissible fade show" role="alert"><strong>Oops! </strong>Error while uploading book.<button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button></div>';
48+
// }
49+
50+
// }
51+
?>
52+
<!doctype html>
53+
<html lang="en">
54+
<head>
55+
<!-- Required meta tags -->
56+
<meta charset="utf-8">
57+
<meta name="viewport" content="width=device-width, initial-scale=1">
58+
59+
<!-- Bootstrap CSS -->
60+
<link href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-EVSTQN3/azprG1Anm3QDgpJLIm9Nao0Yz1ztcQTwFspd3yD65VohhpuuCOmLASjC" crossorigin="anonymous">
61+
62+
<!-- Custom Css -->
63+
64+
<link href="css/style.css" rel="stylesheet">
65+
<link href="css/headermenu.css" rel="stylesheet">
66+
<!-- jQuery Link -->
67+
<?php
68+
include('logo.php')
69+
?>
70+
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.6.0/jquery.min.js"></script>
71+
72+
73+
<title>User Profile Information</title>
74+
</head>
75+
<body>
76+
77+
<br><br><br><br><br>
78+
<div class="container">
79+
80+
<?php
81+
include('headermenu.php')
82+
?>
83+
<script>
84+
$("#navbarDropdownMenuLink").addClass('active')
85+
$("#create-book").addClass('active-d')
86+
</script>
87+
<div class="row">
88+
<div class="col"></div>
89+
<div class="col">
90+
<div class="alert alert-secondary" role="alert">
91+
User Profile
92+
</div>
93+
</div>
94+
<div class="col"></div>
95+
</div>
96+
<!-- <div class="row">
97+
<div class="col"></div>
98+
<div class="col">
99+
<div class="msg"><?=$msg?></div>
100+
</div>
101+
<div class="col"></div>
102+
</div> -->
103+
<br>
104+
<!-- <ul class="nav nav-pills nav-fill">
105+
<li class="nav-item" >
106+
<a class="nav-link fragment-nav-link" id="internship-fragment" style="border-left: 1px solid rgb(221, 221, 221); background-color:#3d4755; color:white;" href="index.php">Internships</a>
107+
</li>
108+
109+
<li class="nav-item">
110+
<a class="nav-link fragment-nav-link" id="mj-fragment" style="border-left: 1px solid rgb(221, 221, 221);" href="indexmicrojobs.php">Micro-Jobs</a>
111+
</li>
112+
113+
<li class="nav-item">
114+
<a class="nav-link fragment-nav-link" id="ft-fragment" href="indexfulltime.php" style="border-left: 1px solid rgb(221, 221, 221); border-right: 1px solid rgb(221, 221, 221);">Full-Time Internships</a>
115+
</li>
116+
</ul> -->
117+
</div>
118+
<div class="container internship-bod">
119+
120+
<div class="container single-view-admin" >
121+
<form id="uploadbooks" method="POST" enctype="multipart/form-data">
122+
<div class="row">
123+
124+
125+
<div class="col ">
126+
127+
<div class="row">
128+
<div class="col">
129+
<strong> Name :</strong> <?= $row['user_id'];?>
130+
131+
</div>
132+
<div class="col">
133+
<strong> Email:</strong> <?=$row['email']?>
134+
</div>
135+
<div class="col">
136+
<strong>Phone Number: </strong> <?= $row['mobile_number'];?>
137+
</div>
138+
139+
140+
</div>
141+
<!-- <div class="row">
142+
<div class="col"></div>
143+
<div class="col">
144+
<button class="know-more-btn" type="button" data-bs-toggle="collapse" data-bs-target="#my2" aria-expanded="false" aria-controls="collapseExample">
145+
On View Details &#8594
146+
</button>
147+
</div>
148+
</div> -->
149+
<!-- <br> -->
150+
151+
</div>
152+
</div>
153+
154+
</form>
155+
156+
</div>
157+
158+
<br>
159+
<!-- Modal -->
160+
161+
<script src="js/bookprocessing.js"></script>
162+
<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.bundle.min.js" integrity="sha384-MrcW6ZMFYlzcLA8Nl+NtUVF0sA7MsXsP1UyJoMp4YLEuNSfAP+JcXn/tWtIaxVXM" crossorigin="anonymous"></script>
163+
164+
</body>
165+
</html>

SYSTEM MANAGEMENT APPS/Bookstore management/MiniProject/MiniProject/signin.php

+4-1
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,12 @@
4545
$row = mysqli_fetch_array($res);
4646

4747
if($row == null){
48+
49+
4850
$mobileno = $_POST["mobilenumber"];
4951
$email = $_POST["email"];
5052
$password = md5($_POST["password"]);
53+
echo $fname;
5154

5255
$query = $link->prepare('INSERT INTO `users` (`email`,`mobile_number`,`password`) VALUES (?,?,?)');
5356

@@ -126,7 +129,7 @@
126129
</div>
127130
<form id="signin-form" method="post">
128131

129-
132+
130133

131134
<div class="form-floating mb-4">
132135
<input type="tel" id="mobile-input-reg" class="form-control" name="mobilenumber" required="required">

SYSTEM MANAGEMENT APPS/Bookstore management/MiniProject/MiniProject/upload.php

+1-19
Original file line numberDiff line numberDiff line change
@@ -101,19 +101,6 @@
101101
<div class="col"></div>
102102
</div>
103103
<br>
104-
<!-- <ul class="nav nav-pills nav-fill">
105-
<li class="nav-item" >
106-
<a class="nav-link fragment-nav-link" id="internship-fragment" style="border-left: 1px solid rgb(221, 221, 221); background-color:#3d4755; color:white;" href="index.php">Internships</a>
107-
</li>
108-
109-
<li class="nav-item">
110-
<a class="nav-link fragment-nav-link" id="mj-fragment" style="border-left: 1px solid rgb(221, 221, 221);" href="indexmicrojobs.php">Micro-Jobs</a>
111-
</li>
112-
113-
<li class="nav-item">
114-
<a class="nav-link fragment-nav-link" id="ft-fragment" href="indexfulltime.php" style="border-left: 1px solid rgb(221, 221, 221); border-right: 1px solid rgb(221, 221, 221);">Full-Time Internships</a>
115-
</li>
116-
</ul> -->
117104
</div>
118105
<div class="container internship-bod">
119106

@@ -144,7 +131,7 @@
144131

145132
</div>
146133
<div class="col">
147-
<p class="jobdetails">Price in Rs:</p>
134+
<p class="jobdetails">Price in &#x20AC;:</p>
148135
<select class="form-select mb-4" id="myselect" aria-label="Default select example" onchange="priceToggle()">
149136
<option value="1" selected>Donate</option>
150137
<option value="2" >Sell</option>
@@ -154,11 +141,6 @@
154141
<label for="price">Price</label>
155142
</div>
156143
</div>
157-
<!-- <div class="col">
158-
<button class="btn btn-danger know-more-btn" type="button" data-bs-toggle="collapse" data-bs-target="#my<?=$idnum?>" aria-expanded="false" aria-controls="collapseExample">
159-
View Details
160-
</button>
161-
</div> -->
162144
</div>
163145
<div class="row">
164146
<div class="col"></div>

0 commit comments

Comments
 (0)