Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Malak/profile css #18

Merged
merged 10 commits into from
Aug 7, 2018
Merged

Malak/profile css #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
1e39937
profile css progress
aboud20-meet Aug 6, 2018
f9fc906
Merge branch 'master' of https://github.com/zain18-meet/Roots into Ma…
aboud20-meet Aug 6, 2018
1881dd8
nothing
aboud20-meet Aug 6, 2018
168850f
merge
aboud20-meet Aug 6, 2018
84ba0c5
st_profile layout
aboud20-meet Aug 6, 2018
4e2a8f9
nothing
sama18-meet Aug 6, 2018
a6c82cf
merged malak branch with the master
sama18-meet Aug 6, 2018
a382bea
add journey and profile
sama18-meet Aug 7, 2018
85ef4b0
profile, apply, addjourney
aboud20-meet Aug 7, 2018
ee63850
Merge branch 'master' into Malak/profile_css
zainalqalawi Aug 7, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
109 changes: 96 additions & 13 deletions project/static/css/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@

.body1{
background-image: url("image1.png");
height: 100%;
}
.apply-img{
background-image: url("image1.png");
height: 100%;
Expand Down Expand Up @@ -117,15 +121,17 @@
cursor: pointer;

}.container {
width: 100%;
width: 70%;
height: 90px;
margin: 0 auto;
background-color: rgba(255,255,255,0.5);
border-radius:7px;
background-color: rgba(0,0,0,0.1);
border-radius:3px;
}


.input {
position: relative;
left: 20px;
display: inline-block;
-webkit-box-sizing: content-box;
-moz-box-sizing: content-box;
Expand All @@ -139,8 +145,6 @@
-o-text-overflow: clip;
text-overflow: clip;
background: rgba(255,255,255,0.1);
-webkit-box-shadow: 2px 2px 2px 0 rgba(0,0,0,0.2) inset;
box-shadow: 2px 2px 2px 0 rgba(0,0,0,0.2) inset;
-webkit-transition: all 200ms cubic-bezier(0.42, 0, 0.58, 1);
-moz-transition: all 200ms cubic-bezier(0.42, 0, 0.58, 1);
-o-transition: all 200ms cubic-bezier(0.42, 0, 0.58, 1);
Expand Down Expand Up @@ -203,6 +207,18 @@
/*float: left*/;
}

.head6 {
-webkit-box-sizing: content-box;
-moz-box-sizing: content-box;
box-sizing: content-box;
border: none;
font: normal 15px/1 Avantgarde, TeX Gyre Adventor, URW Gothic L, sans-serif,bold;
color: black;
-o-text-overflow: ellipsis;
text-overflow: ellipsis;
float: left;
}

.div1 {
-webkit-box-sizing: content-box;
-moz-box-sizing: content-box;
Expand All @@ -218,7 +234,34 @@
text-align: center;
-o-text-overflow: ellipsis;
text-overflow: ellipsis;
background:rgba(400,400,400,0.2);
background:rgba(400,400,400,0.0);


text-shadow: 1px 1px 1px rgba(0,0,0,0.2) ;

}

.div2{
background:rgba(400,400,400,0.0);
border-radius:7px;
}

.div3{
-webkit-box-sizing: content-box;
-moz-box-sizing: content-box;
box-sizing: content-box;
width: 900px;

padding: 20px;
overflow: hidden;
-webkit-border-radius: 6px;
border-radius: 1px;
font:normal 20px/1 Avantgarde, TeX Gyre Adventor, URW Gothic L, sans-serif;
color: white;
text-align: left;
-o-text-overflow: ellipsis;
text-overflow: ellipsis;
background:rgba(400,400,400,0.0);


text-shadow: 1px 1px 1px rgba(0,0,0,0.2) ;
Expand All @@ -230,12 +273,12 @@
-moz-box-sizing: content-box;
box-sizing: content-box;
padding: 10px 20px;
border: 3px solid white;
border: 2px solid black;
-webkit-border-radius: 10px;
border-radius: 30px;
font: normal 16px/normal Arial,bold;
color: white;
background:rgba(26,255,26,0.6);
color: black;
background:white;


}
Expand All @@ -254,10 +297,6 @@
width: 180px;
}

.div2{
background:rgba(400,400,400,0.0);
border-radius:7px;
}
.typewriter{
position: absolute;
top: 200px;
Expand Down Expand Up @@ -343,6 +382,49 @@
word-wrap: break-word;
}



.bg_blue{
background-color: #3399ff /*#99ccff*/;
width: 1000px;
height: 1600px;
position: relative;
top:-220px;
border-color: white;
border-width: 9px;
border-radius: 3px;
}

.bg_blue1{
background-color: #3399ff /*#99ccff*/;
width: 1000px;
height: 1600px;
position: relative;
left: 100px;
top:-220px;
border-color: white;
border-width: 9px;
border-radius: 3px;
}

.bg_blue2{
background-color: #99ccff /*#99ccff*/;
width: 500px;
height: 1600px;
position: relative;
left: 650px;
top:-350px;
border-color: white;
border-width: 9px;
border-radius: 3px;
}
.bio{
font: normal 24px/normal Avantgarde, TeX Gyre Adventor, URW Gothic L, sans-serif,bold;
color: white;
position: relative;
left: 20px;
}

.i2{
background-color: rgb(0,0,0,0.1);
color: black;
Expand All @@ -351,3 +433,4 @@
.leftpad{
padding-left: 50px;
}

111 changes: 74 additions & 37 deletions project/templates/add_journey.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,45 +1,82 @@
<div class="profile-parallax">
{% extends "layout.html" %}
{% block content %}
</div>

<h3 class="head1" style="position: relative; top: -300; left: 250;">Tell Us About Your Journey</h3>
<!-- <hr style="border: 1px solid black; width: 1300; "/> -->
<div class="bg_blue1">
<form class="div3" action="{{url_for('add_journey')}}" method="POST"> Title:

<div class="container">
<form action="{{url_for('add_journey')}}" method="POST">
Title:<br>
<input type="text" name="title" placeholder="Title of the journey" required>
<hr style="border: 1px solid white; width: 170;position: relative;left: 20px; "/>

<input class="input" type="text" name="title" placeholder="Title of the journey" required>
<br>

<h4> Tell us about your journey...</h4>
<textarea name="description" rows="10" cols="30" placeholder=" culture activties more info about it " required>
</textarea>

<br><br>

<h4>Locations</h4>
<textarea name="location" rows="10" cols="30" placeholder="from telaviv rotchild street 60/57 to haifa gardens square 20/35" required>
</textarea>
<h4> Duration of Journey </h4>
<textarea name="duration" rows="10" cols="30" placeholder="1hour to 2 hours" required>
</textarea>

<h4> Target Audience </h4>
<textarea name="category" rows="10" cols="30" placeholder="music and nature lovers a bit of sportivic" required>
</textarea>
<br>
<h4>Requirements</h4>
<textarea name="requirements" rows="10" cols="30" placeholder="sport shoes dry fit shirts swiming suit" required>
</textarea>
<br><br>
<h4> Number of Participants </h4>
<textarea name="people_range" rows="10" cols="30" placeholder="5-10 people" required>
</textarea>
<br><br>
<h4>Enter Intended Price </h4>
<textarea name="price" rows="10" cols="30" placeholder="500 shekels, 250 for the place we will rent... 100 for the security...150 for me" required>
</textarea>
<br><br>
<h4>add image url</h4>
<textarea name="picture" rows="10" cols="30" placeholder="Regular Picture" required>
</textarea>
<button class="btn btn-lg postbtn" type="submit">Submit!</button>
<h4 class="div3"> Tell us about your journey...</h4>

<hr style="border: 1px solid white; width: 170;position: relative;left: 20px; "/>

<textarea class="input" name="description" rows="10" cols="30" placeholder=" culture activties more info about it " required>
</textarea>

<br><br>

<h4 class="div3">Locations</h4>

<hr style="border: 1px solid white; width: 170; position: relative;left: 20px;"/>

<textarea class="input" name="location" rows="10" cols="30" placeholder="from telaviv rotchild street 60/57 to haifa gardens square 20/35" required>
</textarea>

<h4 class="div3"> Duration of Journey </h4>

<hr style="border: 1px solid white; width: 170; position: relative;left: 20px;"/>

<textarea class="input" name="duration" rows="10" cols="30" placeholder="1hour to 2 hours" required>
</textarea>

<h4 class="div3"> Target Audience </h4>

<hr style="border: 1px solid white; width: 170; position: relative;left: 20px;"/>

<textarea class="input" name="category" rows="10" cols="30" placeholder="music and nature lovers a bit of sportivic" required>
</textarea>
<br>

<h4 class="div3">Requirements</h4>

<hr style="border: 1px solid white; width: 170; position: relative;left: 20px;"/>

<textarea class="input" name="requirements" rows="10" cols="30" placeholder="sport shoes dry fit shirts swiming suit" required>
</textarea>
<br><br>

<h4 class="div3"> Number of Participants </h4>

<hr style="border: 1px solid white; width: 170; position: relative;left: 20px;"/>

<textarea class="input" name="people_range" rows="10" cols="30" placeholder="5-10 people" required>
</textarea>
<br><br>

<h4 class="div3">Enter Intended Price </h4>

<hr style="border: 1px solid white; width: 170;position: relative;left: 20px; "/>

<textarea class="input" name="price" rows="10" cols="30" placeholder="500 shekels, 250 for the place we will rent... 100 for the security...150 for me" required>
</textarea>
<br><br>

<h4 class="div3">add image url</h4>

<hr style="border: 1px solid white; width: 170; position: relative;left: 20px;"/>

<textarea class="input" name="picture" rows="10" cols="30" placeholder="Regular Picture" required>
</textarea>

<br><br><br><br>
<button class="button2s" type="submit" style="position: relative;left: 20;">Submit!</button>

</form>
</div>
Expand Down
29 changes: 22 additions & 7 deletions project/templates/apply.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,25 @@
<div class="profile-parallax">
{% extends "layout.html" %}
{% block content %}

<body class="apply-img">
<center>
<br><br><br><br><br><br><br><br>
<p class="head1">Become a Storyteller </p>
</div>
</center>
<center>
<!-- Hi {{ current_user.name }}, -->
<br><br><br>

<p class="head1">Become a Storyteller </p>
<br>
<hr style="border: 0.5px solid white; "/>
<div class="bg_blue">
<br><br><br>
<hr style="border: 1px solid white; width: 170; "/>
<p class="div1"> Emphasis on the Storytellers feelings and experience, not on facts.<br> How your life story affected you.
Don’t include details that aren’t necessary or interesting, and don’t be repetitive.<br>
Talk about a challenge or hardship you overcame.<br>
Talk about your desires, dreams,...<br>
Try to include something for people to take away from your story: message, life lesson, values, inspiration, etc…<br>
Be careful with your words- remember that your listeners may know nothing about your community, culture, or way of living. <br> What you say is what they know.
</p>
<hr style="border: 0.5px solid white;" />
<br><br>
<form class="div2" action="{{url_for('apply')}}" method="POST">

Expand All @@ -37,14 +40,26 @@
<label for="Phone Number" class="words">Phone Number</label>
<input class="input" type="text" name="number" placeholder="Enter Your Phone Number" required>
<br><br>

<label for="bio" class="words">Bio</label>
<input class="input" type="text" name="bio" placeholder="Enter Your Bio" required>
<br><br>

<label for="Picture" class="words"> Picture</label>
<input class="input" type="text" name="picture" placeholder="Enter Your Picture" required>
<br><br>


<br>
<br>
<input type="hidden" name="user_id" value= "{{ session['user_id'] }}" >
<button class="button2s" type="submit">Submit</button>

</form>

</center>

</center>
</div>
</body>

{% endblock %}
2 changes: 1 addition & 1 deletion project/templates/browse.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@


<div class="typewriter">
<h1>Welcome To Roots<!-- , {{current_user.name}} --></h1>
<h1>Welcome To Roots {{current_user.name}} </h1>
</div>

</div>
Expand Down
2 changes: 2 additions & 0 deletions project/templates/journey.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

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

<img src="{{ journey.picture }} " style="width: 1600px; height: 450px; position: relative; top: -20px; left: -405px;">
-->

Expand All @@ -27,6 +28,7 @@ <h3><a href="{{url_for('profile', user_id=journey.creator_id)}}"> {{creator.name
</div>



<div class = "col-md-8 info">
<h1 class="head2">About my journey</h1>
<hr style="border: 0.5px solid black; "/>
Expand Down
Loading