Skip to content

Commit

Permalink
Merge branch 'master' into Malak/profile_css
Browse files Browse the repository at this point in the history
  • Loading branch information
@zainalqalawi
zainalqalawi authored Aug 7, 2018
2 parents 85ef4b0 + a6a7739 commit ee63850
Show file tree
Hide file tree
Showing 2 changed files with 91 additions and 62 deletions.
22 changes: 16 additions & 6 deletions project/static/css/style.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -137,10 +137,9 @@
-moz-box-sizing: content-box;
box-sizing: content-box;
padding: 10px 20px;
width: 500px;
height: 20px;
border: 1.5px solid white;
-webkit-border-radius: 1px;
border: 2px solid white;
-webkit-border-radius: 10px;
border-radius: 10px;
font: normal 16px/normal Arial;
color: white;
-o-text-overflow: clip;
Expand Down Expand Up @@ -193,7 +192,7 @@
color: black;
-o-text-overflow: ellipsis;
text-overflow: ellipsis;
float: left;
/* float: left;*/
}

.head5 {
Expand Down Expand Up @@ -384,6 +383,7 @@
}



.bg_blue{
background-color: #3399ff /*#99ccff*/;
width: 1000px;
Expand Down Expand Up @@ -423,4 +423,14 @@
color: white;
position: relative;
left: 20px;
}
}

.i2{
background-color: rgb(0,0,0,0.1);
color: black;
}

.leftpad{
padding-left: 50px;
}

131 changes: 75 additions & 56 deletions project/templates/journey.html
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,25 @@
{% extends "layout.html" %}
{% block content %}



<!--
<div class= "container-fluid">
<img class="img1" src="{{ journey.picture }}">
<h1> {{journey.title}} </h1>
<img src="{{ journey.picture }} " style="width: 1600px; height: 450px; position: relative; top: -20px; left: -405px;">
-->

<!-- <div class="container">
</div> -->

<!-- style="border-radius: 100%; width: 300px; height: 300px; position: relative; top: -10px; left: 330px;">
-->

<div class="row">
<div class="col-sm-6 col-md-4">
<div class="thumbnail">
<img src="{{url_for('static', filename='profile.png')}}" class="img-fluid" alt="Responsive image">
<div class="col-sm-6 col-md-4 leftpad">
<div class="thumbnail ">
<img src="{{url_for('static', filename='profile.png')}}" class="img-fluid" alt="Responsive image" >

<div class="caption">
<h3><a href="{{url_for('profile', user_id=journey.creator_id)}}"> {{creator.name}} </a></h3>
<p>{{creator.bio}}</p>
Expand All @@ -17,50 +28,36 @@ <h3><a href="{{url_for('profile', user_id=journey.creator_id)}}"> {{creator.name
</div>


<div> <img class="img1" src="{{ journey.picture }}"> </div>
<div> <h1> {{journey.title}} </h1>
<h1> storyteller : <a href="{{url_for('profile', user_id=journey.creator_id)}}"> {{creator.name}} </a> </h1>
<h1> location : {{journey.location}} </h1>
<h1> description : {{journey.description}} </h1>
<h1> duration : {{journey.duration}} </h1>
<h1> price : {{journey.price}} </h1>
<h1> category : {{journey.category}} </h1>
<h1> requirements : {{journey.requirements}} </h1>
<h1> people range : {{journey.people_range}} </h1>
<h1>Price: {{ journey.price }}</h1><br>
<br><br>


<!-- <img class="img1" src="{{ journey.picture }}">
<h1> {{journey.title}} </h1>
>>>>>>> master
<div class = "col-md-8">

<div class = "col-md-8 info">
<h1 class="head2">About my journey</h1>
<hr style="border: 0.5px solid black; "/>
<p> location : {{journey.location}} </p>
<p> description : {{journey.description}} </p>
<p> duration : {{journey.duration}} </p>
<p></p>> price : {{journey.price}} </p>
<p> price : {{journey.price}} </p>
<p> category : {{journey.category}} </p>
<p> requirements : {{journey.requirements}} </p>
<p> people range : {{journey.people_range}} </p>
-->

<br>
{% if current_user.is_authenticated %}

<form action="{{url_for('im_interested', interested_user_id=current_user.id, st_id=current_user.id, journey_id=journey.id)}}" method="POST">
<button type="submit"> I'm Interested! </button>
<button class="button2s" type="submit"> I'm Interested! </button>
</form>
{%else%}
<form action="{{url_for('users.login')}}">
<button type="submit"> I'm Interested! </button>
<button class="button2s" type="submit"> I'm Interested! </button>
</form>
{% endif %}

</div>
</div>

</div>
<hr style="border: 0.5px solid black; "/>
<div class= "row">
<div class= "col-md-6">
<h2>Reviews of {{ journey.title }}</h2>
<div class= "col-md-6 leftpad">
<h2 class="head3">Reviews of {{ journey.title }}</h2>

{% for rating in all_ratings %}

Expand All @@ -74,7 +71,7 @@ <h2>Reviews of {{ journey.title }}</h2>

</div>
<div class= "col-md-6">
<h2> Questions about {{journey.title}} </h2>
<h2 class="head3"> Questions about {{journey.title}} </h2>

{% for question in all_questions %}
{{question.title}} by {{question.user_id}} at {{question.time}}<br>
Expand All @@ -84,50 +81,72 @@ <h2> Questions about {{journey.title}} </h2>
</div>
</div>
<div class = "row" >
<div class= "col-md-6">
<div class= "col-md-6 leftpad">

{% if current_user.is_authenticated %}

<form action="{{url_for('add_rating', journey_id=journey.id)}}" method="POST">
Stars:
<select class="form-control">
<option>1</option>
<option>2</option>
<option>3</option>
<option>4</option>
<option>5</option>
</select>

Title of review:
<input type="text" name="title" required>
Review:
<input type="text" name="review" required>
<button type="submit"> Add Review </button>
<div class= "form-group" >
<label for="stars" class="head4"> Stars </label>
<br>
<select class="form-control input i2" style=" width: 30px">
<option>1</option>
<option>2</option>
<option>3</option>
<option>4</option>
<option>5</option>
</select>
</div>
<br>
<div class= "form-group" >
<label for="title" class="head4"> Title of review: </label>
<br>
<input class="input i2" type="text" name="title" required>
</div>
<br>
<div class= "form-group" >
<label for="review" class="head4" > Review: </label>
<br>
<input class="input i2" type="text" name="review" required>
</div>
<br>
<button class="button2s" type="submit"> Add Review: </button>

{%else%}

<input type="text" name="review" required>
<button type="submit"> Add Review </button>
<input type="text" name="review" >
<br>
<button class="button2s" type="submit"> Add Review :"</button>

</form>
{% endif %}
</div>

<div class= "col-md-6">

{% if current_user.is_authenticated %}


<form action="{{url_for('question', journey_id=journey.id)}}" method="POST">
Title
<input type="text" name="title" required>
Question
<input type="text" name="question" required>
<button type="submit"> Ask! </button>
<div class= "orm-group" >
<label for="title" class="head4"> Title: </label>
<br>
<input class="input i2 type="text" name="title" required>
</div>
<br>
<div class= "form-group" >
<label for="question" class="head4"> Question </label>
<br>
<input class="input i2" type="text" name="question" required>
</div>
<br>
<button class="button2s" type="submit"> Ask! </button>
</form>

{%else%}
<form action="{{url_for('users.login')}}">
<button type="submit"> Ask! </button>
<br>
<button class="button2s" type="submit"> Ask! </button>
</form>

{% endif %}
Expand Down

0 comments on commit ee63850

Please sign in to comment.