Skip to content

Commit

Permalink
Merge pull request #56 from sharetribe/v5.0.0
Browse files Browse the repository at this point in the history
Release v5.0.0
  • Loading branch information
Gnito authored Nov 21, 2019
2 parents a4589d4 + 7703ad8 commit 7f5eba2
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 17 deletions.
15 changes: 13 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,15 @@ https://github.com/sharetribe/flex-template-web/

## Upcoming version 2019-XX-XX

## [v5.0.0] 2019-11-21

This release creates lots of changes to the default logic (only one listing aka teacher profile
allowed), translations files (Saunatime is changed to Yogatime), and it also adds
AvailabilityExceptions to EditListingAvailabilityPanel. If you have started with the original Flex
Template for Web, you need to be extra careful when you switch to this release, since there are pull
request that you might need to revert when you take update from upstream. (E.g. you might want to
allow multiple listings in your marketplace.)

- [change] Copy-text changes (most of them to EditListingWizard panels and all the "classes" are
changed to "sessions") [#55](https://github.com/sharetribe/ftw-time/pull/55)
- [fix] Reseting bookingStartDate picker didn't reset the current month.
Expand Down Expand Up @@ -90,6 +99,8 @@ https://github.com/sharetribe/flex-template-web/
IconClose, and removes unused translations (EditListingAvailabilityForm was removed).
[#31](https://github.com/sharetribe/ftw-time/pull/31)

[v5.0.0]: https://github.com/sharetribe/ftw-time/compare/v4.1.0...v5.0.0

## [v4.1.0] 2019-11-04

### One change in this template
Expand Down Expand Up @@ -120,7 +131,7 @@ https://github.com/sharetribe/flex-template-web/
- [change] Add default tx process definition. Remove default email templates.
[#1220](https://github.com/sharetribe/flex-template-web/pull/1220)

[v4.1.0]: https://github.com/sharetribe/flex-template-web/compare/v4.0.0...v4.1.0
[v4.1.0]: https://github.com/sharetribe/ftw-time/compare/v4.0.0...v4.1.0

## [v4.0.0] 2019-10-25

Expand Down Expand Up @@ -165,7 +176,7 @@ https://github.com/sharetribe/flex-template-web/
- [add] add FieldTimeZoneSelect component and a script that can extract IANA time zone keys from
moment-timezone's JSON formatted files. [#2](https://github.com/sharetribe/ftw-time/pull/2)

[v4.0.0]: https://github.com/sharetribe/flex-template-web/compare/v3.5.1...v4.0.0
[v4.0.0]: https://github.com/sharetribe/ftw-time/compare/v3.5.1...v4.0.0

## [v3.5.1] 2019-09-17

Expand Down
22 changes: 8 additions & 14 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
# Sharetribe Flex Template for Web: time-based process

[![CircleCI](https://circleci.com/gh/sharetribe/flex-template-web.svg?style=svg&circle-token=198451e83e5cecb0d662949260dbc3273ac44a67)](https://circleci.com/gh/sharetribe/flex-template-web)
[![CircleCI](https://circleci.com/gh/sharetribe/ftw-hourly.svg?style=svg&circle-token=198451e83e5cecb0d662949260dbc3273ac44a67)](https://circleci.com/gh/sharetribe/ftw-hourly)

> **Note** If you are using day-based booking process (i.e. daily or nightly bookings), you should
> choose the original [Flex Template for Web](https://github.com/sharetribe/flex-template-web/)
> instead.
> choose the original [Flex Template for Web](https://github.com/sharetribe/ftw-daily/) instead.
This is a **beta** version of the template web application for a Sharetribe Flex marketplace using
**time-based booking process**. Many things in the template, from things like default content pages
Expand All @@ -13,30 +12,25 @@ or viewing availability exceptions as a provider is not yet supported. This supp
later.

This repository is a fork from the existing FTW repository (which is using nightly booking process).
So, if you have started working with the original FTW repository and you want to change to FTW-time,
you can
So, if you have started working with the original FTW repository and you want to change to
FTW-hourly, you can
[change the 'upstream' remote repository](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/configuring-a-remote-for-a-fork).

> Note: we have created [another template](https://github.com/sharetribe/ftw-time) for time-based
> processes. It is still in **beta** mode, but if you are taking time-based booking process into
> use, you should consider using it instead. You can read more from the related
> [Flex Docs article](https://www.sharetribe.com/docs/background/time-based-template)
## Quick start

> **Note:** this template assumes that you are using
> [time-based transaction process](https://www.sharetribe.com/docs/guides/how-to-take-time-based-bookings-into-use/)
> with alias `preauth-unit-time-booking/release-1`, if you are using something else, you should
> change the alias name from
> [config.js](https://github.com/sharetribe/ftw-time/blob/master/src/config.js#L35) and
> [util/transaction.js](https://github.com/sharetribe/ftw-time/blob/master/src/util/transaction.js#L111)
> [config.js](https://github.com/sharetribe/ftw-hourly/blob/master/src/config.js#L35) and
> [util/transaction.js](https://github.com/sharetribe/ftw-hourly/blob/master/src/util/transaction.js#L111)
If you just want to get the app running quickly to test it out, first install
[Node.js](https://nodejs.org/) and [Yarn](https://yarnpkg.com/), and follow along:

```sh
git clone [email protected]:sharetribe/ftw-time.git # clone this repository
cd flex-template-web/ # change to the cloned directory
git clone [email protected]:sharetribe/ftw-hourly.git # clone this repository
cd ftw-hourly/ # change to the cloned directory
yarn install # install dependencies
yarn run config # add the mandatory env vars to your local config
yarn run dev # start the dev server, this will open a browser in localhost:3000
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "app",
"version": "v4.1.0",
"version": "v5.0.0",
"private": true,
"license": "Apache-2.0",
"dependencies": {
Expand Down

0 comments on commit 7f5eba2

Please sign in to comment.