Skip to content

Commit

Permalink
WIP: User flow redesign (#736)
Browse files Browse the repository at this point in the history
## Long story short:
1. Added Privacy Policy + TOS
2. New tea time event pages `/tea_times/123`
3. New tea times index pages `/tea_times`
4. Redirecting all city pages to `/tea_times`
5. Cosmetic improvements to host dashboard and account settings
6. New display logic for tea times (per month)
7. Lots of messy CSS, hacky partials, and a few failed tests b/c of new button copy

## Not done:
1. Toggle to see next month's tea times
2. No re-introduction of suggest city interface


— Whatever Github autogenerated here:


* Implement new /tea_times page for listing current month's tea times

New /tea_times (TeaTimes controller, index action) page showing the
month's tea times.

Old /tea_times path moved to /tea_times/list.

Homepage updated so the CTAs on the homepage now lead to /tea_times.

* Ensure user is redirected to the tea time they selected after signup/login

After selecting a tea time at /tea_times, save the tea time they
selected in Devise's stored location in the session and redirect to it
after signup/login.

* After a user signs up for a tea time, set user's home city if blank

If the user's home city is blank and they sign up for a tea time, set
their home city to that tea time's city.

* Update tests for /tea_times to /tea_times/list move

* Add tests for redirecting a user after signup and setting home city after attendance

* Add functionality and test for redirecting to a tea time after login

* Deprecate cities: Cities -> Tea Times in menu/footer

* Deprecate cities: user login redirect: cities -> tea times

* Add /tea_times remind next month button, city select on signup

Button on /tea_times to remind next month now goes to signup page.
Shows alert that they will be reminded next month after singup.

Signup page now has home city selector.

Clicking a tea time as a logged-out user and going to the signup
page will fill in the home city automatically.

Updated redirect paths to remove city pages from user flow.

* Allow /tea_times/123 page to be viewable publicly

* Fix attendance modal activation on pages navigated with Turbolinks

Previously, pages navigated to via Turbolinks did not cause modals
to be attched.

* Remove type conversion for redirect URL after login

* new tea time page design

* new tea time event page partial complete

* fix broken tea_time reference in tea time row partial

* complete tea time event page

* copy edit

* hide host commitment functionality, add edit profile clarity to account settings

* turn off host profile creation email, make facebook field in host profile form editable

* new jump to city styles on tea time page

* jump to city copy edit

* raw text for TOS and privacy policy

* edit sign up home city dropdown styles

* Add Terms and Privacy template pages and links

* Tea Times: Add jump to city design and functionality

* Tea Times: Remove modals

* Tea Times: Don't show past tea times in this month

* Redirect all city pages to /tea_times

* Tea Times: Use city codes as anchor links

* Remove city page links

* Apply tea time display logic to host pages

* Fix city page test, now redirects

* jump cities styles

* jump city styles update

* add tagline to host profile partial

* Tea Times: Sort page by cities with most tea times

* share links on tea time page, TOS and privacy policy

* metadata for tea time event page

* metadata for tea time index page

* Tea Times: Fix tea time ordering

* wrap tea time box in link

* modified status buttons on tea time index page

* user behavior test copy fix
  • Loading branch information
markbao authored and ankitshah811 committed Jun 2, 2018
1 parent 7df3a5d commit 582c8ef
Show file tree
Hide file tree
Showing 46 changed files with 1,741 additions and 353 deletions.
Binary file added app/assets/images/landing/tea-time-banner.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 4 additions & 3 deletions app/assets/javascripts/modals.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ function modalActivation() {
}
});

$('.tea-time-scheduling').on('click', function(evt) {
modal = loadModal(evt.currentTarget.href)(evt)
});
// $('.tea-time-scheduling').on('click', function(evt) {
// modal = loadModal(evt.currentTarget.href)(evt)
// });

$('.cities.show a.cancel').on('click', function(evt) {
console.log(evt)
Expand All @@ -42,3 +42,4 @@ function modalActivation() {

$(document).ready(modalActivation)
$(document).on('page:load', modalActivation)
$(document).on('turbolinks:load', modalActivation)
5 changes: 5 additions & 0 deletions app/assets/stylesheets/base/typography.scss
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,11 @@ h4 {

h5 {
font-size: $h5-font-size;

&.strong {
font-weight: 600;
text-transform: uppercase;
}
}

h6 {
Expand Down
6 changes: 5 additions & 1 deletion app/assets/stylesheets/components/_cover-photo.scss
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@

&.city-banner {
margin-bottom: $base-font-size*3;

}

.content {

@extend %vertical-center-flex-container;
Expand All @@ -56,6 +56,10 @@
@include media($tablet) {
@include padding(110px 0);
}

&.tt-index {
padding: 75px 0;
}
}

.content-box {
Expand Down
34 changes: 29 additions & 5 deletions app/assets/stylesheets/components/_dashboard-forms.scss
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,21 @@ These are styles related to forms within the user or host dashboards
.split-container, .name-email, .social, .new-password {
@include outer-container;
@include span-columns(12);

padding: 0 20px;
margin: 0;

@include media($tablet) {
padding: 0 1em;
}
}

input:read-only {
background-color: lighten($tws-yellow, 25);
border: 1px solid $tws-yellow;
}

input:-moz-read-only {
background-color: lighten($tws-yellow, 25);
border: 1px solid $tws-yellow;
}

}

.field {
Expand Down Expand Up @@ -173,7 +181,7 @@ These are styles related to forms within the user or host dashboards
margin: 0 auto;
margin-bottom: -1em;
font-size: 0.8em;
font-weight: bold;
font-weight: 600;
padding: .2em 0;
text-align: center;
position: relative;
Expand Down Expand Up @@ -329,3 +337,19 @@ These are styles related to forms within the user or host dashboards
}
}
}

.hosting-commitment {
display: none;
}

h3.form-subheader.no-margin {
margin: 0;
}

.edit-profile-link {
padding: 20px;

p {
margin: 0 !important;
}
}
4 changes: 4 additions & 0 deletions app/assets/stylesheets/components/_footer.scss
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,10 @@ footer {
@include shift(1);
}

.footer-link-top-margin {
margin-top: 20px;
}

.ethos-rant {
color: $tws-white;

Expand Down
6 changes: 6 additions & 0 deletions app/assets/stylesheets/components/_site-wide.scss
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,9 @@
.wrapper-content {
height: 100vh;
}

.container {
&.tt-page {
margin-bottom: 4em;
}
}
Loading

0 comments on commit 582c8ef

Please sign in to comment.