From 1e3993766db0c9311a207c2e1684d565d1a47782 Mon Sep 17 00:00:00 2001 From: aboud20-meet Date: Mon, 6 Aug 2018 11:08:29 +0300 Subject: [PATCH 1/6] profile css progress --- project/templates/apply.html | 9 +++++++++ project/templates/st_profile.html | 25 +++++++++++++++++-------- project/views.py | 2 ++ 3 files changed, 28 insertions(+), 8 deletions(-) diff --git a/project/templates/apply.html b/project/templates/apply.html index 9864cde..0c912c5 100644 --- a/project/templates/apply.html +++ b/project/templates/apply.html @@ -34,6 +34,15 @@

+ + + +

+ + + +

+ diff --git a/project/templates/st_profile.html b/project/templates/st_profile.html index 01c4bdb..a4610db 100644 --- a/project/templates/st_profile.html +++ b/project/templates/st_profile.html @@ -1,23 +1,32 @@ {% extends "layout.html" %} {% block content %} -STORYTELLER PROFILE + {% if current_user.id == profile.id %} -

this is your profile. You are a storyteller.

+ {% else %} -

this is not your profile

+ {% endif %} - - +{% if profile.profile_img == none %} + +{% else %} + +{% endif %} +

{{profile.name}}

-

{{profile.email}}

-{{ profile.country }} +

{{profile.city}}

+

{{profile.country}}

+

{{profile.proffession}}

+
+
+

{{profile.bio}}

+
-
+

{{ profile.name }}'s journeys:
diff --git a/project/views.py b/project/views.py index bcad255..e69274b 100644 --- a/project/views.py +++ b/project/views.py @@ -22,6 +22,8 @@ def apply(): current_user.birthday = request.form.get('birthday') current_user.city = request.form.get('city') current_user.number = request.form.get('number') + current_user.bio = request.form.get('bio') + current_user.profile_img = request.form.get('picture') current_user.is_storyteller = True db.session.commit() return redirect(url_for('profile', user_id=current_user.id)) From 1881dd81e4780b333dc41336e6d3536994fec3b1 Mon Sep 17 00:00:00 2001 From: aboud20-meet Date: Mon, 6 Aug 2018 12:51:33 +0300 Subject: [PATCH 2/6] nothing --- project/templates/journey.html | 6 +++--- project/templates/st_profile.html | 18 ++++++++++-------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/project/templates/journey.html b/project/templates/journey.html index f33a4aa..fd5ccd8 100644 --- a/project/templates/journey.html +++ b/project/templates/journey.html @@ -2,7 +2,8 @@ {% block content %}
- + +

{{journey.title}}

@@ -15,8 +16,7 @@

{{creator.name

- -

{{journey.title}}

+

location : {{journey.location}}

description : {{journey.description}}

diff --git a/project/templates/st_profile.html b/project/templates/st_profile.html index a4610db..f543951 100644 --- a/project/templates/st_profile.html +++ b/project/templates/st_profile.html @@ -9,26 +9,28 @@ {% endif %} - +
+
{% if profile.profile_img == none %} +
{% else %} {% endif %} -
+

{{profile.name}}

+
+

{{profile.city}}

{{profile.country}}

-

{{profile.proffession}}

+

{{profile.profession}}

+
-

{{profile.bio}}

-
-

{{ profile.name }}'s journeys: -
+ @@ -47,5 +49,5 @@

{{profile.bio}}

{% endif %} - +
{% endblock %} \ No newline at end of file From 84ba0c5de89f5ac3e0127e7c370ff512a0503f70 Mon Sep 17 00:00:00 2001 From: aboud20-meet Date: Mon, 6 Aug 2018 13:07:28 +0300 Subject: [PATCH 3/6] st_profile layout --- project/templates/st_profile.html | 46 ++++++++++++++++--------------- 1 file changed, 24 insertions(+), 22 deletions(-) diff --git a/project/templates/st_profile.html b/project/templates/st_profile.html index f543951..5d811b6 100644 --- a/project/templates/st_profile.html +++ b/project/templates/st_profile.html @@ -10,22 +10,23 @@ {% endif %}
-
-{% if profile.profile_img == none %} -
- -{% else %} - -{% endif %} - -

{{profile.name}}

-
-
-

{{profile.city}}

-

{{profile.country}}

-

{{profile.profession}}

-
-
+
+ +
+ {% if profile.profile_img != none %} + + {% else %} + + {% endif %} +
+ +
+

{{profile.name}}

+

{{profile.city}}

+

{{profile.country}}

+

{{profile.profession}}

+
+

{{profile.bio}}

@@ -33,12 +34,13 @@

{{profile.bio}}

- -{% for journey in st_journeys %} -{{ journey.title }} -
-{% endfor %} - +
+ {% for journey in st_journeys %} +
+ {{ journey.title }} +
+ {% endfor %} +
From 4e2a8f99b0c723f64600ce010887a49a84c3d077 Mon Sep 17 00:00:00 2001 From: Sama Date: Tue, 7 Aug 2018 00:16:30 +0300 Subject: [PATCH 4/6] nothing --- project/static/css/style.css | 2 +- project/templates/apply.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/project/static/css/style.css b/project/static/css/style.css index 9063ff1..fd97835 100644 --- a/project/static/css/style.css +++ b/project/static/css/style.css @@ -1,5 +1,5 @@ -body{ +.body1{ background-image: url("image1.png"); height: 100%; background-position: center; diff --git a/project/templates/apply.html b/project/templates/apply.html index 1ad78d2..881f241 100644 --- a/project/templates/apply.html +++ b/project/templates/apply.html @@ -1,6 +1,6 @@ {% extends "layout.html" %} {% block content %} - +



From a382beac20784d99c91fbbb3cf141043b80e0589 Mon Sep 17 00:00:00 2001 From: Sama Date: Tue, 7 Aug 2018 14:11:41 +0300 Subject: [PATCH 5/6] add journey and profile --- project/static/css/style.css | 93 ++++++++++++++++++++---- project/templates/add_journey.html | 111 +++++++++++++++++++---------- project/templates/browse.html | 2 +- project/templates/st_profile.html | 42 ++++++----- 4 files changed, 182 insertions(+), 66 deletions(-) diff --git a/project/static/css/style.css b/project/static/css/style.css index 654f4cb..6047347 100644 --- a/project/static/css/style.css +++ b/project/static/css/style.css @@ -121,30 +121,31 @@ 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; box-sizing: content-box; padding: 10px 20px; - border: 2px solid white; - -webkit-border-radius: 10px; - border-radius: 30px; + width: 700px; + height: 20px; + border: 1.5px solid white; + -webkit-border-radius: 1px; font: normal 16px/normal Arial; color: white; -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); @@ -207,6 +208,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; @@ -229,6 +242,33 @@ } +.div2{ + background:rgba(400,400,400,0.6); + 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) ; + +} + .button2s { -webkit-box-sizing: content-box; -moz-box-sizing: content-box; @@ -258,10 +298,6 @@ width: 180px; } -.div2{ - background:rgba(400,400,400,0.0); - border-radius:7px; -} .typewriter{ position: absolute; top: 200px; @@ -347,3 +383,36 @@ word-wrap: break-word; } +.bio { + -webkit-box-sizing: content-box; + -moz-box-sizing: content-box; + box-sizing: content-box; + width: 360px; + padding: 50px 144px; + overflow: hidden; + border: 1px solid rgba(124,122,122,0.28); + -webkit-border-radius: 4px; + border-radius: 4px; + font: normal 16px/1 Avantgarde, TeX Gyre Adventor, URW Gothic L, sans-serif,bold; + color: rgba(0,0,0,1); + text-align: center; + -o-text-overflow: ellipsis; + text-overflow: ellipsis; + background: #eaeced; + -webkit-box-shadow: 1px 1px 1px 0 rgba(0,0,0,0.3) ; + box-shadow: 1px 1px 1px 0 rgba(0,0,0,0.3) ; + text-shadow: 1px 1px 1px rgba(0,0,0,0.2) ; +} + +.bg_blue{ + background-color: #99ccff /*#99ccff*/; + width: 1000px; + height: 1600px; + position: relative; + left: 150px; + top:-220px; + border-color: white; + border-width: 9px; + border-radius: 3px; +} + diff --git a/project/templates/add_journey.html b/project/templates/add_journey.html index 861a346..6335b61 100644 --- a/project/templates/add_journey.html +++ b/project/templates/add_journey.html @@ -1,45 +1,82 @@ +
{% extends "layout.html" %} {% block content %} +
+ +

Tell Us About Your Journey

+ +
+
Title: -
- - Title:
- +
+ +
-

Tell us about your journey...

- - -

- -

Locations

- -

Duration of Journey

- - -

Target Audience

- -
-

Requirements

- -

-

Number of Participants

- -

-

Enter Intended Price

- -

-

add image url

- - +

Tell us about your journey...

+ +
+ + + +

+ +

Locations

+ +
+ + + +

Duration of Journey

+ +
+ + + +

Target Audience

+ +
+ + +
+ +

Requirements

+ +
+ + +

+ +

Number of Participants

+ +
+ + +

+ +

Enter Intended Price

+ +
+ + +

+ +

add image url

+ +
+ + + +



+
diff --git a/project/templates/browse.html b/project/templates/browse.html index 0dd4a41..8efc364 100644 --- a/project/templates/browse.html +++ b/project/templates/browse.html @@ -5,7 +5,7 @@
-

Welcome To Roots

+

Welcome To Roots {{current_user.name}}

diff --git a/project/templates/st_profile.html b/project/templates/st_profile.html index dab38fb..dff11c5 100644 --- a/project/templates/st_profile.html +++ b/project/templates/st_profile.html @@ -5,7 +5,7 @@
-STORYTELLER PROFILE + {% if current_user.id == profile.id %} @@ -19,42 +19,52 @@
{% if profile.profile_img != none %} - + + {% else %} - + + {% endif %}
-
-

{{profile.name}}

-

{{profile.city}}

-

{{profile.country}}

-

{{profile.profession}}

+
+
+

City:

{{profile.city}}


+

Country:

{{profile.country}}


+

Profession:

{{profile.profession}}

-

{{profile.bio}}

-{{ profile.name }}'s journeys: +
+

{{profile.name}}


+
+

{{profile.bio}}

+
+ + +

{{ profile.name }}'s journeys:

-
+
{% for journey in st_journeys %}
{{ journey.title }}
{% endfor %} -
- - +
+ +
+
+
{% if current_user.id == profile.id %}
- +
{% endif %}
-{% endblock %} \ No newline at end of file +{% endblock %} From 85ef4b056ddd3291636cb10bea05fff53583ad6c Mon Sep 17 00:00:00 2001 From: aboud20-meet Date: Tue, 7 Aug 2018 18:16:59 +0300 Subject: [PATCH 6/6] profile, apply, addjourney --- project/static/css/style.css | 64 +++++++++++++++++------------- project/templates/add_journey.html | 4 +- project/templates/apply.html | 24 ++++++----- project/templates/st_profile.html | 26 ++++++------ 4 files changed, 64 insertions(+), 54 deletions(-) diff --git a/project/static/css/style.css b/project/static/css/style.css index 6047347..64b34c5 100644 --- a/project/static/css/style.css +++ b/project/static/css/style.css @@ -137,7 +137,7 @@ -moz-box-sizing: content-box; box-sizing: content-box; padding: 10px 20px; - width: 700px; + width: 500px; height: 20px; border: 1.5px solid white; -webkit-border-radius: 1px; @@ -235,7 +235,7 @@ 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) ; @@ -243,7 +243,7 @@ } .div2{ - background:rgba(400,400,400,0.6); + background:rgba(400,400,400,0.0); border-radius:7px; } @@ -274,12 +274,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; } @@ -383,36 +383,44 @@ word-wrap: break-word; } -.bio { - -webkit-box-sizing: content-box; - -moz-box-sizing: content-box; - box-sizing: content-box; - width: 360px; - padding: 50px 144px; - overflow: hidden; - border: 1px solid rgba(124,122,122,0.28); - -webkit-border-radius: 4px; - border-radius: 4px; - font: normal 16px/1 Avantgarde, TeX Gyre Adventor, URW Gothic L, sans-serif,bold; - color: rgba(0,0,0,1); - text-align: center; - -o-text-overflow: ellipsis; - text-overflow: ellipsis; - background: #eaeced; - -webkit-box-shadow: 1px 1px 1px 0 rgba(0,0,0,0.3) ; - box-shadow: 1px 1px 1px 0 rgba(0,0,0,0.3) ; - text-shadow: 1px 1px 1px rgba(0,0,0,0.2) ; -} .bg_blue{ - background-color: #99ccff /*#99ccff*/; + background-color: #3399ff /*#99ccff*/; width: 1000px; height: 1600px; position: relative; - left: 150px; 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; +} \ No newline at end of file diff --git a/project/templates/add_journey.html b/project/templates/add_journey.html index 6335b61..59b3ba3 100644 --- a/project/templates/add_journey.html +++ b/project/templates/add_journey.html @@ -5,7 +5,7 @@

Tell Us About Your Journey

-
+
Title:
@@ -26,7 +26,7 @@

Locations

-

Duration of Journey

diff --git a/project/templates/apply.html b/project/templates/apply.html index 9d44fb4..f039835 100644 --- a/project/templates/apply.html +++ b/project/templates/apply.html @@ -1,15 +1,18 @@ +
{% extends "layout.html" %} {% block content %} - - - +
+







+

Become a Storyteller

+
+



-

Become a Storyteller

-
-
+
+


+

Emphasis on the Storytellers feelings and experience, not on facts.
How your life story affected you. Don’t include details that aren’t necessary or interesting, and don’t be repetitive.
Talk about a challenge or hardship you overcame.
@@ -17,7 +20,6 @@ Try to include something for people to take away from your story: message, life lesson, values, inspiration, etc…
Be careful with your words- remember that your listeners may know nothing about your community, culture, or way of living.
What you say is what they know.

-


@@ -39,11 +41,11 @@

- +

- +

@@ -55,7 +57,9 @@ -
+ + +
{% endblock %} \ No newline at end of file diff --git a/project/templates/st_profile.html b/project/templates/st_profile.html index dff11c5..30cdc9d 100644 --- a/project/templates/st_profile.html +++ b/project/templates/st_profile.html @@ -19,10 +19,10 @@
{% if profile.profile_img != none %} - + {% else %} - + {% endif %}
@@ -31,30 +31,28 @@

City:

{{profile.city}}


Country:

{{profile.country}}


-

Profession:

{{profile.profession}}

+

Profession:

{{profile.profession}}


+

Bio:

{{profile.bio}}

- +

{{profile.name}}


-

{{profile.name}}


-
-

{{profile.bio}}

-
- - -

{{ profile.name }}'s journeys:

+
+ + +

{{ profile.name }}'s journeys:

{% for journey in st_journeys %} -
- {{ journey.title }} +
+

{{ journey.title }}
{% endfor %}
- +