Skip to content

Bojan Borovcanin / WBT1920_team30

Go to a project
Commit 745aa7bb by Bojan Borovcanin
Options

Hope this is it

parent 715251a9
Inline Side-by-side
Showing with 169 additions and 70 deletions
assets/css/myProfile.css 0 → 100644
body {
font: 400 15px Lato, sans-serif;
line-height: 1.8;
color: #818181;
margin: 5px;
}
input{
display: inline-block;
float: left;
margin-left: 5px;
margin-bottom: 10px;
background-color: #8fd19e;
color: black;
}
label{
display: inline-block;
float: left;
clear: left;
width: 250px;
text-align: right;
margin-left: 5px;
margin-bottom: 10px;
}
h1{
margin-left: 5px;
width: 100%;
}
assets/css/registration.css 0 → 100644
body {
font: 400 15px Lato, sans-serif;
line-height: 1.8;
color: #818181;
margin: 50px;
}
.errors{
color: red;
font-style: italic;
}
.firstCol{
float: left;
width: 50%;
}
.secondCol{
float: left;
width: 50%;
}
#btn_signup{
margin-top: 10px;
background-color: #2cc36b;
size: 15px 15px;
color: black;
}
h1{
text-align: center;
width: 100%;
}
assets/database/activities.sql
This diff could not be displayed because it is too large.
assets/database/apartment.sql
This diff could not be displayed because it is too large.
assets/database/user.sql
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
-- https://www.phpmyadmin.net/ -- https://www.phpmyadmin.net/
-- --
-- Host: 127.0.0.1 -- Host: 127.0.0.1
-- Generation Time: Apr 16, 2020 at 12:01 PM -- Generation Time: May 12, 2020 at 03:52 AM
-- Server version: 10.4.11-MariaDB -- Server version: 10.4.11-MariaDB
-- PHP Version: 7.4.3 -- PHP Version: 7.4.3
...@@ -41,10 +41,17 @@ CREATE TABLE `user` ( ...@@ -41,10 +41,17 @@ CREATE TABLE `user` (
`NATIONALITY` varchar(30) COLLATE latin1_bin NOT NULL, `NATIONALITY` varchar(30) COLLATE latin1_bin NOT NULL,
`COMPANY` varchar(50) COLLATE latin1_bin NOT NULL, `COMPANY` varchar(50) COLLATE latin1_bin NOT NULL,
`GENDER` varchar(20) COLLATE latin1_bin NOT NULL, `GENDER` varchar(20) COLLATE latin1_bin NOT NULL,
`acl` tinyint(3) UNSIGNED DEFAULT '2' `acl` tinyint(3) UNSIGNED DEFAULT 2
) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_bin; ) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_bin;
-- --
-- Dumping data for table `user`
--
INSERT INTO `user` (`IDUSER`, `FIRSTNAME`, `LASTNAME`, `USERNAME`, `EMAIL`, `PASSWORD`, `DATEOFBIRTH`, `COUNTRY`, `CITY`, `NATIONALITY`, `COMPANY`, `GENDER`, `acl`) VALUES
(15, 'Bojan', 'Borovcanin', 'bojan97', 'bojan_borovcanin@hotmail.com', '548dff74c328bebbfbafb3800a2f3b78d024bc4a7bd1258eb4974a1e92948df9', '1997-09-02', '27', 'Sokolac', 'Sebian', 'East Sarajevo', 'Male', 2);
--
-- Indexes for dumped tables -- Indexes for dumped tables
-- --
...@@ -63,7 +70,7 @@ ALTER TABLE `user` ADD FULLTEXT KEY `PASSWORD` (`PASSWORD`); ...@@ -63,7 +70,7 @@ ALTER TABLE `user` ADD FULLTEXT KEY `PASSWORD` (`PASSWORD`);
-- AUTO_INCREMENT for table `user` -- AUTO_INCREMENT for table `user`
-- --
ALTER TABLE `user` ALTER TABLE `user`
MODIFY `IDUSER` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=13; MODIFY `IDUSER` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=16;
COMMIT; COMMIT;
/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */; /*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
......
test/views/pages/home.php
...@@ -153,22 +153,24 @@ ...@@ -153,22 +153,24 @@
if(!isset($_SESSION['logged_in'])) if(!isset($_SESSION['logged_in']))
{ {
?> ?>
<div class="row text-center"> <div class="row text-center" style="margin-left: 25%">
<div class="col-sm-4"> <div class="col-sm-8">
<div class="thumbnail"> <div class="thumbnail">
<?php foreach ($apartments as $apartment) { <?php foreach ($apartments as $apartment) {
?> ?>
<center>
<?php echo '<img src="data:image/jpeg;base64,'.base64_encode($apartment['image']).'" alt = "image"> '; <?php echo '<img src="data:image/jpeg;base64,'.base64_encode($apartment['image']).'" alt = "image"> ';
echo "<p><strong> ".$apartment['title']." </strong></p>"; echo "<p><strong> ".$apartment['title']." </strong></p>";
echo "<p>".$apartment['description']."</p>"; echo "<p>".$apartment['description']."</p>";
?> ?>
</center>
<?php <?php
} }
?> ?>
<?php <?php
} ?> } ?>
</div> </div>
</div> </div>
</div> </div>
...@@ -227,11 +229,11 @@ ...@@ -227,11 +229,11 @@
if ($_SESSION['logged_in']['acl'] == 2) { if ($_SESSION['logged_in']['acl'] == 2) {
?> ?>
<div class="row text-center"> <div class="row text-center" style="margin-left: 25%">
<div class="col-sm-4"> <div class="col-sm-8">
<div class="thumbnail"> <div class="thumbnail">
<form action="<?php echo base_url();?>pages/moreAboutApartment" method="get"> <form action="<?php echo base_url();?>pages/moreAboutApartment" method="get">
<center>
<?php foreach ($apartments as $apartment) { <?php foreach ($apartments as $apartment) {
?> ?>
<?php echo '<img src="data:image/jpeg;base64,'.base64_encode($apartment['image']).'" alt = "image"> '; <?php echo '<img src="data:image/jpeg;base64,'.base64_encode($apartment['image']).'" alt = "image"> ';
...@@ -242,6 +244,7 @@ ...@@ -242,6 +244,7 @@
?> ?>
<?php <?php
} ?> } ?>
</center>
</form> </form>
......
test/views/pages/moreAboutActivity.php
...@@ -12,15 +12,30 @@ ...@@ -12,15 +12,30 @@
<script src="https://code.jquery.com/jquery-3.4.1.slim.min.js" integrity="sha384-J6qa4849blE2+poT4WnyKhv5vZF5SrPo0iEjwBvKU7imGFAV0wwj1yYfoRSJoZ+n" crossorigin="anonymous"></script> <script src="https://code.jquery.com/jquery-3.4.1.slim.min.js" integrity="sha384-J6qa4849blE2+poT4WnyKhv5vZF5SrPo0iEjwBvKU7imGFAV0wwj1yYfoRSJoZ+n" crossorigin="anonymous"></script>
<script src="https://cdn.jsdelivr.net/npm/popper.js@1.16.0/dist/umd/popper.min.js" integrity="sha384-Q6E9RHvbIyZFJoft+2mJbHaEWldlvI9IOYy5n3zV9zzTtmI3UksdQRVvoxMfooAo" crossorigin="anonymous"></script> <script src="https://cdn.jsdelivr.net/npm/popper.js@1.16.0/dist/umd/popper.min.js" integrity="sha384-Q6E9RHvbIyZFJoft+2mJbHaEWldlvI9IOYy5n3zV9zzTtmI3UksdQRVvoxMfooAo" crossorigin="anonymous"></script>
<link rel="stylesheet" href="<?php echo base_url();?>assets/css/home1.css">
</head> </head>
<body> <body>
<br> <br>
<?php echo '<img src="data:image/jpeg;base64,'.base64_encode($activity['image']).'" width = "300px" alt = "image"> ';
<div class="container" style="margin-top:30px">
<div class="row">
<div class="col-sm-4">
<h5>Activity photo:</h5>
<?php echo '<img src="data:image/jpeg;base64,'.base64_encode($activity['image']).'" width = "300px" alt = "image"> ';
?> ?>
</div>
<div class="col-sm-8">
<br>
<label>Title of the activity:</label> <label>Title of the activity:</label>
<br>
<input type="text" name="title" disabled="true" value="<?php <input type="text" name="title" disabled="true" value="<?php
echo $activity['title']; echo $activity['title'];
?>" > ?>" >
...@@ -35,12 +50,14 @@ ...@@ -35,12 +50,14 @@
<br> <br>
<label>Date and time:</label> <label>Date and time:</label>
<br>
<input type="datetime" disabled="true" name="datetime" value="<?php <input type="datetime" disabled="true" name="datetime" value="<?php
echo $activity['datetime']; echo $activity['datetime'];
?>" > ?>" >
<br> <br>
<label>Price</label> <label>Price</label>
<br>
<input type="text" name="title" disabled="true" value="<?php <input type="text" name="title" disabled="true" value="<?php
echo $activity['price']; echo $activity['price'];
?>" > ?>" >
...@@ -48,23 +65,28 @@ ...@@ -48,23 +65,28 @@
<br> <br>
<label>Name of the activity menager:</label> <label>Name of the activity menager:</label>
<br>
<input type="text" name="title" disabled="true" value="<?php <input type="text" name="title" disabled="true" value="<?php
echo $activity['full_name']; echo $activity['full_name'];
?>" > ?>" >
<br> <br>
<label>Phone number of the activity menager:</label> <label>Phone number of the activity menager:</label>
<br>
<input type="text" name="title" disabled="true" value="<?php <input type="text" name="title" disabled="true" value="<?php
echo $activity['phone_number']; echo $activity['phone_number'];
?>" > ?>" >
<br> <br>
<label>Email of the activity menager:</label> <label>Email of the activity menager:</label>
<br>
<input type="text" name="title" size="30" disabled="true" value="<?php <input type="text" name="title" size="30" disabled="true" value="<?php
echo $activity['email']; echo $activity['email'];
?>" > ?>" >
</div>
</div>
</div>
</body> </body>
</html> </html>
\ No newline at end of file
test/views/pages/moreAboutApartment.php
...@@ -2,25 +2,30 @@ ...@@ -2,25 +2,30 @@
<html> <html>
<head> <head>
<title></title> <title></title>
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css" integrity="sha384-Vkoo8x4CGsO3+Hhxv8T/Q5PaXtkKtu6ug5TOeNV6gBiFeWPGFN9MuhOf23Q9Ifjh" crossorigin="anonymous"> <meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="stylesheet" href="<?php echo base_url();?>assets/css/bootstrap.min.css"> <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.4.1/css/bootstrap.min.css">
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.4.1/jquery.min.js"></script>
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script> <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.4.1/js/bootstrap.min.js"></script>
<link href="https://fonts.googleapis.com/css?family=Montserrat" rel="stylesheet" type="text/css">
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/js/bootstrap.min.js" integrity="sha384-wfSDF2E50Y2D1uUdj0O3uMBJnjuUD4Ih7YwaYd1iqfktj0Uod8GCExl3Og8ifwB6" crossorigin="anonymous"></script> <link href="https://fonts.googleapis.com/css?family=Lato" rel="stylesheet" type="text/css">
<link rel="stylesheet" href="<?php echo base_url();?>assets/css/home1.css">
<script src="https://code.jquery.com/jquery-3.4.1.slim.min.js" integrity="sha384-J6qa4849blE2+poT4WnyKhv5vZF5SrPo0iEjwBvKU7imGFAV0wwj1yYfoRSJoZ+n" crossorigin="anonymous"></script>
<script src="https://cdn.jsdelivr.net/npm/popper.js@1.16.0/dist/umd/popper.min.js" integrity="sha384-Q6E9RHvbIyZFJoft+2mJbHaEWldlvI9IOYy5n3zV9zzTtmI3UksdQRVvoxMfooAo" crossorigin="anonymous"></script>
</head> </head>
<body> <body>
<br> <br>
<?php <div class="container" style="margin-top:30px">
echo '<img src="data:image/jpeg;base64,'.base64_encode($apartment['image']).'" width = "100px" alt = "image"> '; <div class="row">
<div class="col-sm-4">
<h5>Apartment photo:</h5>
<?php echo '<img src="data:image/jpeg;base64,'.base64_encode($apartment['image']).'" width = "300px" alt = "image"> ';
?> ?>
<br> </div>
<div class="col-sm-8">
<label>Title of the apartment:</label> <label>Title of the apartment:</label>
<br> <br>
<input type="text" name="title" disabled="true" value="<?php <input type="text" name="title" disabled="true" value="<?php
...@@ -63,5 +68,10 @@ ...@@ -63,5 +68,10 @@
echo $apartment['email']; echo $apartment['email'];
?>" > ?>" >
<br> <br>
</div>
</div>
</div>
</body> </body>
</html> </html>
\ No newline at end of file
test/views/pages/myProfile.php
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
<script src="https://code.jquery.com/jquery-3.4.1.slim.min.js" integrity="sha384-J6qa4849blE2+poT4WnyKhv5vZF5SrPo0iEjwBvKU7imGFAV0wwj1yYfoRSJoZ+n" crossorigin="anonymous"></script> <script src="https://code.jquery.com/jquery-3.4.1.slim.min.js" integrity="sha384-J6qa4849blE2+poT4WnyKhv5vZF5SrPo0iEjwBvKU7imGFAV0wwj1yYfoRSJoZ+n" crossorigin="anonymous"></script>
<script src="https://cdn.jsdelivr.net/npm/popper.js@1.16.0/dist/umd/popper.min.js" integrity="sha384-Q6E9RHvbIyZFJoft+2mJbHaEWldlvI9IOYy5n3zV9zzTtmI3UksdQRVvoxMfooAo" crossorigin="anonymous"></script> <script src="https://cdn.jsdelivr.net/npm/popper.js@1.16.0/dist/umd/popper.min.js" integrity="sha384-Q6E9RHvbIyZFJoft+2mJbHaEWldlvI9IOYy5n3zV9zzTtmI3UksdQRVvoxMfooAo" crossorigin="anonymous"></script>
<link rel="stylesheet" href="<?php echo base_url();?>assets/css/myProfile.css">
</head> </head>
<body> <body>
...@@ -72,4 +72,4 @@ ...@@ -72,4 +72,4 @@
<br> <br>
</body> </body>
</html> </html>
\ No newline at end of file
test/views/pages/registration.php
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
<title>Registration</title> <title>Registration</title>
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css" integrity="sha384-Vkoo8x4CGsO3+Hhxv8T/Q5PaXtkKtu6ug5TOeNV6gBiFeWPGFN9MuhOf23Q9Ifjh" crossorigin="anonymous"> <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css" integrity="sha384-Vkoo8x4CGsO3+Hhxv8T/Q5PaXtkKtu6ug5TOeNV6gBiFeWPGFN9MuhOf23Q9Ifjh" crossorigin="anonymous">
<link rel="stylesheet" href="<?php echo base_url();?>assets/css/bootstrap.min.css"> <link rel="stylesheet" href="<?php echo base_url();?>assets/css/bootstrap.min.css">
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script> <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/js/bootstrap.min.js" integrity="sha384-wfSDF2E50Y2D1uUdj0O3uMBJnjuUD4Ih7YwaYd1iqfktj0Uod8GCExl3Og8ifwB6" crossorigin="anonymous"></script> <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/js/bootstrap.min.js" integrity="sha384-wfSDF2E50Y2D1uUdj0O3uMBJnjuUD4Ih7YwaYd1iqfktj0Uod8GCExl3Og8ifwB6" crossorigin="anonymous"></script>
<script src="https://code.jquery.com/jquery-3.4.1.slim.min.js" integrity="sha384-J6qa4849blE2+poT4WnyKhv5vZF5SrPo0iEjwBvKU7imGFAV0wwj1yYfoRSJoZ+n" crossorigin="anonymous"></script> <script src="https://code.jquery.com/jquery-3.4.1.slim.min.js" integrity="sha384-J6qa4849blE2+poT4WnyKhv5vZF5SrPo0iEjwBvKU7imGFAV0wwj1yYfoRSJoZ+n" crossorigin="anonymous"></script>
<script src="https://cdn.jsdelivr.net/npm/popper.js@1.16.0/dist/umd/popper.min.js" integrity="sha384-Q6E9RHvbIyZFJoft+2mJbHaEWldlvI9IOYy5n3zV9zzTtmI3UksdQRVvoxMfooAo" crossorigin="anonymous"></script> <script src="https://cdn.jsdelivr.net/npm/popper.js@1.16.0/dist/umd/popper.min.js" integrity="sha384-Q6E9RHvbIyZFJoft+2mJbHaEWldlvI9IOYy5n3zV9zzTtmI3UksdQRVvoxMfooAo" crossorigin="anonymous"></script>
<link rel="stylesheet" href="<?php echo base_url();?>assets/css/registration.css">
</head> </head>
<body> <body>
Welcome to the registration page:All fields are reqiered! <p1> Welcome to the registration page: All fields are reqiered!</p1>
<div> <div>
<form action="<?php echo base_url();?>user/signUp" method="post"> <div class="firstCol">
<form action="<?php echo base_url();?>user/signUp" method="post">
<div ></div> <div ></div>
<label >NAME:</label> <label >Name:</label>
<br> <br>
<input type="text" name="firstname" placeholder="First Name" > <input type="text" name="firstname" placeholder="First Name" >
<div class="errors"><?php echo form_error('firstname'); ?></div> <div class="errors"><?php echo form_error('firstname'); ?></div>
<br> <br>
<label>LAST NAME:</label> <label>Last Name:</label>
<br> <br>
<input type="text" name="lastname" placeholder="Last Name" > <input type="text" name="lastname" placeholder="Last Name" >
<div class="errors"><?php echo form_error('lastname'); ?></div> <div class="errors"><?php echo form_error('lastname'); ?></div>
<br> <br>
<label>GENDER:</label>
<br>
<label >
<input type="radio" name="gender" value="Male">Male
</label>
<label>
<input type="radio" name="gender" value="Female" >Female
</label>
<div class="errors"> <?php echo form_error('gender'); ?></div>
<br> <label >Choose Your Username:</label>
<label >Choose your username:</label>
<br> <br>
<input type="text" name="username" id="username" placeholder="User Name" > <input type="text" name="username" id="username" placeholder="User Name" >
<div class="errors"><?php echo form_error('username'); ?></div> <div class="errors"><?php echo form_error('username'); ?></div>
<br> <br>
<label>EMAIL:</label> <label>e-Mail:</label>
<br> <br>
<input type="email" name="email" id="email" placeholder="ex: myname@example.com" > <input type="email" name="email" id="email" placeholder="ex: myname@example.com" >
<div class="errors"> <?php echo form_error('email'); ?></div> <div class="errors"> <?php echo form_error('email'); ?></div>
<span id="obavjestenjeEmail"></span> <span id="obavjestenjeEmail"></span>
<br> <br>
<label >PASSWORD:</label> <label >Password:</label>
<br> <br>
<input type="password" name="password" placeholder="Password" > <input type="password" name="password" placeholder="Password" >
<div class="errors"> <?php echo form_error('password'); ?></div> <div class="errors"> <?php echo form_error('password'); ?></div>
<span id="errMessage"></span>
<br> <br>
<span id="errMessage"></span>
<input type="password" name="confirmPassword" id="confirmPassword" placeholder="Confirm password"> <input type="password" name="confirmPassword" id="confirmPassword" placeholder="Confirm password">
<div class="errors"> <?php echo form_error('confirmPassword'); ?></div> <div class="errors"> <?php echo form_error('confirmPassword'); ?></div>
<br> </div>
<br>
<label>BIRTH DATE:</label> <div class="secondCol">
<label>Gender:</label>
<br>
<label >
<input type="radio" name="gender" value="Male">Male
</label>
<label>
<input type="radio" name="gender" value="Female" >Female
</label>
<div class="errors"> <?php echo form_error('gender'); ?></div>
<label>Birth Date:</label>
<br> <br>
<input type="Date" id="datefield" min="1899-01-01" max="<?php echo date('Y-m-d'); ?>" name="dateofbirth" placeholder="Birth date" > <input type="Date" id="datefield" min="1899-01-01" max="<?php echo date('Y-m-d'); ?>" name="dateofbirth" placeholder="Birth date" >
<div class="errors"> <?php echo form_error('dateofbirth'); ?></div> <div class="errors"> <?php echo form_error('dateofbirth'); ?></div>
...@@ -107,14 +110,17 @@ ...@@ -107,14 +110,17 @@
<br> <br>
<input type="text" name="city" value="<?php echo set_value('city'); ?>" placeholder="City" > <input type="text" name="city" value="<?php echo set_value('city'); ?>" placeholder="City" >
<div class="errors"> <?php echo form_error('city'); ?></div> <div class="errors"> <?php echo form_error('city'); ?></div>
</div>
</div>
<br>
<br> <br>
<br> <br>
<input id="btn_signup" type="submit" name="signup-submit"> <input id="btn_signup" type="submit" name="signup-submit">
<br>
</form> </form>
</div>
</body> </body>
</html> </html>
\ No newline at end of file
test/views/pages/workerProfile.php
...@@ -11,12 +11,7 @@ ...@@ -11,12 +11,7 @@
<link href="https://fonts.googleapis.com/css?family=Lato" rel="stylesheet" type="text/css"> <link href="https://fonts.googleapis.com/css?family=Lato" rel="stylesheet" type="text/css">
<link rel="stylesheet" href="<?php echo base_url();?>assets/css/home1.css"> <link rel="stylesheet" href="<?php echo base_url();?>assets/css/home1.css">
<style>
.fakeimg {
height: 200px;
background: #aaa;
}
</style>
</head> </head>
<body> <body>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment