Skip to content

Commit d9afc8f

Browse files
JRyanSaundersJRyanSaunders
committed
finito
1 parent 90fedc9 commit d9afc8f

23 files changed

+603
-189
lines changed

‎.DS_Store

0 Bytes
Binary file not shown.

‎admin-pages/block-validation/text_block_validation.php

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,23 +5,23 @@
55
*
66
*/
77

8-
$rating_block_1_block_color_1 = $_POST['block_' . $block_ID .'_text_block_background_color'];
9-
if (!empty($rating_block_1_block_color_1)) {
10-
$column_to_update = 'METAVALUE="' . $rating_block_1_block_color_1 . '"';
8+
$text_block_background_color = $_POST['block_' . $block_ID .'_text_block_background_color'];
9+
if (!empty($text_block_background_color)) {
10+
$column_to_update = 'METAVALUE="' . $text_block_background_color . '"';
1111
$row_to_update = $page_finder . '"block_' . $block_ID . '_text_block_background_color")';
1212
EasyTrade_Database::update_database_record($table_to_update, $column_to_update, $row_to_update);
1313
}
1414

15-
$rating_block_1_block_color_1 = $_POST['block_' . $block_ID .'_text_block_lead_title'];
16-
if (!empty($rating_block_1_block_color_1)) {
17-
$column_to_update = 'METAVALUE="' . $rating_block_1_block_color_1 . '"';
15+
$text_block_lead_title = $_POST['block_' . $block_ID .'_text_block_lead_title'];
16+
if (!empty($text_block_lead_title)) {
17+
$column_to_update = 'METAVALUE="' . $text_block_lead_title . '"';
1818
$row_to_update = $page_finder . '"block_' . $block_ID . '_text_block_lead_title")';
1919
EasyTrade_Database::update_database_record($table_to_update, $column_to_update, $row_to_update);
2020
}
2121

22-
$rating_block_1_block_color_1 = $_POST['block_' . $block_ID .'_text_block_text'];
23-
if (!empty($rating_block_1_block_color_1)) {
24-
$column_to_update = 'METAVALUE="' . $rating_block_1_block_color_1 . '"';
22+
$text_block_text = $_POST['block_' . $block_ID .'_text_block_text'];
23+
if (!empty($text_block_text)) {
24+
$column_to_update = 'METAVALUE="' . $text_block_text . '"';
2525
$row_to_update = $page_finder . '"block_' . $block_ID . '_text_block_text")';
2626
EasyTrade_Database::update_database_record($table_to_update, $column_to_update, $row_to_update);
2727
}

‎admin-pages/block-validation/text_column_block_validation.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
*
66
*/
77

8-
$text_column_block_background_colour = $_POST['block_' . $block_ID .'_background_color'];
8+
$text_column_block_background_colour = $_POST['block_' . $block_ID .'_text_column_block_background_color'];
99
if (!empty($text_column_block_background_colour)) {
1010
$column_to_update = 'METAVALUE="' . $text_column_block_background_colour . '"';
1111
$row_to_update = $page_finder . '"block_' . $block_ID . '_text_column_block_background_color")';

‎admin-pages/pages/blog-post-edit.php

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,14 @@
1616
include '../../block-validation/page_header_submit.php';
1717

1818
$block_ID = 1;
19-
include '../../block-validation/text_column_block_validation.php';
19+
include '../../block-validation/text_block_validation.php';
2020

2121
$block_ID = 1;
2222
include '../../block-validation/image_message_block_submit.php';
2323

24+
$block_ID = 1;
25+
include '../../block-validation/text_column_block_validation.php';
26+
2427
$block_ID = 1;
2528
include '../../block-validation/polaroid_block_submit.php';
2629

@@ -64,7 +67,7 @@
6467
$message_block_link = (isset($block_1_message_block_link) == 1) ? $block_1_message_block_link : '';
6568
include '../../blocks/image_message_block.php';
6669

67-
$background_color = (isset($block_1_background_color) == 1) ? $block_1_background_color : '';
70+
$column_background_color = (isset($block_1_text_column_block_background_color) == 1) ? $block_1_text_column_block_background_color : '';
6871
$text_column_block_column_1_lead_title = (isset($block_1_text_column_block_column_1_lead_title) == 1) ? $block_1_text_column_block_column_1_lead_title : '';
6972
$text_column_block_column_1_text = (isset($block_1_text_column_block_column_1_text) == 1) ? $block_1_text_column_block_column_1_text : '';
7073
$text_column_block_column_2_lead_title = (isset($block_1_text_column_block_column_2_lead_title) == 1) ? $block_1_text_column_block_column_2_lead_title : '';

‎admin-pages/tradesman-dashboard.php

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,51 @@
77

88
<h1> Your Dashboard </h1>
99

10+
1011
<form method="post" action="<?php echo EasyTrade_Home_URL . 'functions/publish-tradesman-page.php'?>">
1112

1213
<input type="hidden" name="tradesman_ID" value="<?php echo $user_ID ?>">
1314
<input type="submit" value="publish">
1415

1516
</form>
17+
18+
<div class="row">
19+
<div class="col-sm-6">
20+
<a href="/tradesman-pages/my-details.php">
21+
<div class="quicklink">
22+
<img class="img-responsive" src="<?php echo EasyTrade_Home_URL . '/assets/img/logo.png' ?>"/>
23+
<h3>My Details</h3>
24+
</div>
25+
</a>
26+
</div>
27+
<div class="col-sm-6">
28+
<a href="/tradesman-pages/my-page.php">
29+
<div class="quicklink">
30+
<img class="img-responsive" src="<?php echo EasyTrade_Home_URL . '/assets/img/logo.png' ?>"/>
31+
<h3>My Webpage</h3>
32+
</div>
33+
</a>
34+
</div>
35+
</div>
1636

37+
<div class="row">
38+
<div class="col-sm-6">
39+
<a href="/tradesman-pages/my-enquiries.php">
40+
<div class="quicklink">
41+
<img class="img-responsive" src="<?php echo EasyTrade_Home_URL . '/assets/img/logo.png' ?>"/>
42+
<h3>My Enquiries</h3>
43+
</div>
44+
</a>
45+
</div>
46+
<div class="col-sm-6">
47+
<a href="/tradesman-pages/my-reviews.php">
48+
<div class="quicklink">
49+
<img class="img-responsive" src="<?php echo EasyTrade_Home_URL . '/assets/img/logo.png' ?>"/>
50+
<h3>My Reviews</h3>
51+
</div>
52+
</a>
53+
</div>
54+
</div>
1755
</div>
1856

1957
<?php

‎admin-pages/tradesman-pages/my-enquiries.php

Lines changed: 31 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -8,46 +8,48 @@
88
$page_ID = $row['ID'];
99
}
1010
}
11-
12-
if ($_POST) {
13-
14-
//validate
15-
//update database
16-
}
17-
18-
// get current data and fill fields
19-
2011
?>
2112

2213
<div class="admin-page">
2314

2415
<h1> Entries </h1>
2516
<h2>Contact Forms</h2>
2617
<hr>
27-
<?php $form_type = 'tradesman__' . $user_ID . '__enquiry-form'; ?>
18+
<?php $form_type = 'enquiry__' . $page_ID; ?>
2819
<div class="row">
2920
<div class="col-sm-2"><?php echo "ENTRY ID" ?></div>
30-
<div class="col-sm-2"><?php echo "USER NAME" ?></div>
31-
<div class="col-sm-2"><?php echo "USER TYPE" ?></div>
32-
<div class="col-sm-2"><?php echo "USER ENQUIRY TYPE" ?></div>
33-
<div class="col-sm-2"><?php echo "USER EMAIL" ?></div>
21+
<div class="col-sm-2"><?php echo "ENQUIRY TYPE" ?></div>
22+
<div class="col-sm-2"><?php echo "QUOTE NAME" ?></div>
23+
<div class="col-sm-2"><?php echo "QUOTE EMAIL" ?></div>
24+
<div class="col-sm-2"><?php echo "QUOTE PHONE NUMBER" ?></div>
3425
</div>
3526

36-
<form method="post">
37-
38-
39-
<!-- company name etc -->
40-
41-
42-
43-
44-
45-
46-
47-
48-
<input type="submit" value="save">
49-
50-
</form>
27+
<?php
28+
$entries = EasyTrade_Database::get_from_database("SELECT * FROM entry WHERE FORM_NAME='" . $form_type . "'");
29+
if ($entries->num_rows > 0) {
30+
while($column = $entries->fetch_assoc()) {
31+
$entry_ID = $column["ID"];
32+
$entry_meta = EasyTrade_Database::get_from_database("SELECT * FROM entry_meta WHERE ENTRYID='" . $entry_ID . "'");
33+
if ($entry_meta->num_rows > 0) {
34+
35+
while($row = $entry_meta->fetch_assoc()) {
36+
$variable_name = $row["METAKEY"];
37+
$$variable_name = $row["METAVALUE"];
38+
}
39+
}
40+
?>
41+
42+
<div class="row">
43+
<div class="col-sm-2"><?php echo $entry_ID ?></div>
44+
<div class="col-sm-2"><?php echo $enquiry_type ?></div>
45+
<div class="col-sm-2"><?php echo $quote_name ?></div>
46+
<div class="col-sm-2"><?php echo $quote_email ?></div>
47+
<div class="col-sm-2"><?php echo $quote_phoneno ?></div>
48+
</div>
49+
<div class="row"><?php echo $quote_comment ?></div>
50+
<hr>
51+
<?php }
52+
} ?>
5153
</div>
5254

5355

‎admin-pages/tradesman-pages/my-page.php

Lines changed: 37 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,13 @@
9494
EasyTrade_Database::insert_into_table('tradesman_page_meta', 'PAGEID, METAKEY, METAVALUE', $data);
9595
}
9696

97+
}
98+
else if ($_POST['form_name'] == 'remove-team-member') {
99+
100+
$team_member_ID = $_POST['team_member_ID'];
101+
$identifier = "ID=" . $team_member_ID;
102+
EasyTrade_Database::delete_database_record('tradesman_page_meta', $identifier);
103+
97104
}
98105
else if ($_POST['form_name'] == 'previous-work') {
99106

@@ -110,6 +117,13 @@
110117
}
111118

112119
}
120+
else if ($_POST['form_name'] == 'remove-previous-work') {
121+
122+
$previous_work_ID = $_POST['previous_work_ID'];
123+
$identifier = "ID=" . $previous_work_ID;
124+
EasyTrade_Database::delete_database_record('tradesman_page_meta', $identifier);
125+
126+
}
113127
}
114128

115129
?>
@@ -192,17 +206,22 @@
192206
$get_team_members = EasyTrade_Database::get_from_database("SELECT * FROM `tradesman_page_meta` WHERE `PAGEID`=$page_ID AND `METAKEY`='team_member'");
193207
if ($get_team_members->num_rows>0) {
194208
while($row = $get_team_members->fetch_assoc()) {
209+
$team_member_ID = $row["ID"];
195210
$team_member = $row["METAVALUE"];
196211
$split_team_member_details = explode('__', $team_member);
197212

198213
$name = $split_team_member_details[0];
199214
$image = $split_team_member_details[1];
200215

201-
echo "<div class='team-member'>";
202-
echo "Name: " . $name . "<br>";
203-
echo "Image: " . $image . "<br>";
204-
echo "<button>Delete Team Member</button>";
205-
echo "</div>";
216+
echo "<form method='post'>";
217+
echo "<input type='hidden' name='form_name' value='remove-team-member'>";
218+
echo "<input type='hidden' name='team_member_ID' value='$team_member_ID'>";
219+
echo "<div class='team-member'>";
220+
echo "Name: " . $name . "<br>";
221+
echo "Image: " . $image . "<br>";
222+
echo "<button type='submit'>Delete Team Member</button>";
223+
echo "</div>";
224+
echo "</form>";
206225

207226
}
208227
} ?>
@@ -213,7 +232,6 @@
213232
<h2> Your Team </h2>
214233

215234

216-
217235
<fieldset>
218236
<?php $team_member_name = (isset($team_member_name) == 1) ? $team_member_name : ''; ?>
219237
<label for="team_member_name">Team Member Name:</label>
@@ -239,6 +257,7 @@
239257
$get_previous_work = EasyTrade_Database::get_from_database("SELECT * FROM `tradesman_page_meta` WHERE `PAGEID`=$page_ID AND `METAKEY`='previous_work'");
240258
if ($get_previous_work->num_rows>0) {
241259
while($row = $get_previous_work->fetch_assoc()) {
260+
$previous_work_ID = $row["ID"];
242261
$previous_work = $row["METAVALUE"];
243262
$split_previous_work_details = explode('__', $previous_work);
244263

@@ -247,13 +266,18 @@
247266
$title = $split_previous_work_details[2];
248267
$desc = $split_previous_work_details[3];
249268

250-
echo "<div class='previous-work'>";
251-
echo "Block Border Colour: " . $block_border_color . "<br>";
252-
echo "Image: " . $image . "<br>";
253-
echo "Title: " . $title . "<br>";
254-
echo "Description: " . $desc . "<br>";
255-
echo "<button>Delete Previous Work</button>";
256-
echo "</div>";
269+
270+
echo "<form method='post'>";
271+
echo "<input type='hidden' name='form_name' value='remove-previous-work'>";
272+
echo "<input type='hidden' name='previous_work_ID' value='$previous_work_ID'>";
273+
echo "<div class='previous-work'>";
274+
echo "Block Border Colour: " . $block_border_color . "<br>";
275+
echo "Image: " . $image . "<br>";
276+
echo "Title: " . $title . "<br>";
277+
echo "Description: " . $desc . "<br>";
278+
echo "<button type='submit'>Delete Previous Work</button>";
279+
echo "</div>";
280+
echo "</form>";
257281

258282
}
259283
} ?>

‎admin-pages/tradesman-pages/my-reviews.php

Lines changed: 35 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -9,44 +9,46 @@
99
}
1010
}
1111

12-
if ($_POST) {
13-
14-
//validate
15-
//update database
16-
}
17-
18-
// get current data and fill fields
19-
2012
?>
2113

2214
<div class="admin-page">
2315

24-
<h1> Reviews </h1>
25-
<hr>
26-
<?php $form_type = 'tradesman__' . $user_ID . '__reviews'; ?>
27-
<div class="row">
28-
<div class="col-sm-2"><?php echo "ENTRY ID" ?></div>
29-
<div class="col-sm-2"><?php echo "USER NAME" ?></div>
30-
<div class="col-sm-2"><?php echo "USER TYPE" ?></div>
31-
<div class="col-sm-2"><?php echo "USER ENQUIRY TYPE" ?></div>
32-
<div class="col-sm-2"><?php echo "USER EMAIL" ?></div>
33-
</div>
34-
35-
<form method="post">
36-
37-
38-
<!-- company name etc -->
39-
40-
41-
42-
43-
44-
45-
46-
47-
<input type="submit" value="save">
16+
<h1> Reviews </h1>
17+
<hr>
18+
<?php $form_type = 'review__' . $page_ID; ?>
19+
<div class="row">
20+
<div class="col-sm-2"><?php echo "ENTRY ID" ?></div>
21+
<div class="col-sm-2"><?php echo "BLOCK COLOUR" ?></div>
22+
<div class="col-sm-2"><?php echo "RATING" ?></div>
23+
<div class="col-sm-2"><?php echo "REVIEW" ?></div>
24+
<div class="col-sm-2"><?php echo "REVIEW NAME" ?></div>
25+
</div>
4826

49-
</form>
27+
<?php
28+
$entries = EasyTrade_Database::get_from_database("SELECT * FROM entry WHERE FORM_NAME='" . $form_type . "'");
29+
if ($entries->num_rows > 0) {
30+
while($column = $entries->fetch_assoc()) {
31+
$entry_ID = $column["ID"];
32+
$entry_meta = EasyTrade_Database::get_from_database("SELECT * FROM entry_meta WHERE ENTRYID='" . $entry_ID . "'");
33+
if ($entry_meta->num_rows > 0) {
34+
35+
while($row = $entry_meta->fetch_assoc()) {
36+
$variable_name = $row["METAKEY"];
37+
$$variable_name = $row["METAVALUE"];
38+
}
39+
}
40+
?>
41+
42+
<div class="row">
43+
<div class="col-sm-2"><?php echo $entry_ID ?></div>
44+
<div class="col-sm-2"><?php echo $block_colour ?></div>
45+
<div class="col-sm-2"><?php echo $rating ?></div>
46+
<div class="col-sm-2"><?php echo $review ?></div>
47+
<div class="col-sm-2"><?php echo $review_name ?></div>
48+
</div>
49+
<hr>
50+
<?php }
51+
} ?>
5052
</div>
5153

5254

‎assets/.DS_Store

0 Bytes
Binary file not shown.

‎assets/css/base/header.scss

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,9 @@
124124
@include breakpoint(tablet) {
125125
position: absolute;
126126
top: 50px;
127+
right: 30px;
128+
}
129+
@include breakpoint(desktop) {
127130
right: -45px;
128131
}
129132
}

0 commit comments

Comments
 (0)