Skip to content

Commit 4862912

Browse files
authored
chore: Release v1.9
chore: Release v1.9
2 parents d8e2cdb + 46acd93 commit 4862912

36 files changed

+322
-103
lines changed

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,6 @@ testem.log
2323
.idea
2424

2525
/yarn-error.log
26+
27+
# OS-X Trash
28+
.DS_Store

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
language: node_js
22

33
node_js:
4-
- "8"
5-
# - "10"
4+
- "12"
5+
66

77
# sudo: required
88

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ RUN node scripts/l10n.js generate && \
2020
##
2121
##
2222

23-
FROM node:10-alpine
23+
FROM node:12-alpine
2424

2525
WORKDIR /fastboot
2626

README.md

Lines changed: 38 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ The front end for the **Open Event Server**
1717
[![Deploy](https://www.herokucdn.com/deploy/button.svg)](https://heroku.com/deploy)
1818

1919
**API Documentation:**
20-
- Every installation of the **Open Event Server** project includes API docs, (e.g. here on the test install [https://open-event-api.herokuapp.com](https://open-event-api.herokuapp.com)).
21-
- A hosted version of the API docs is available in the `gh-pages` branch of the **Open Event Server** repository at [http://dev.eventyay.com/api/v1](http://dev.eventyay.com/api/v1)
20+
- Every installation of the **Open Event Server** project includes API docs, (e.g. here on the test install [https://open-event-api.herokuapp.com](https://open-event-api.herokuapp.com)).
21+
- A hosted version of the API docs is available in the `gh-pages` branch of the **Open Event Server** repository at [http://dev.eventyay.com/api/v1](http://dev.eventyay.com/api/v1)
2222

2323
## Communication
2424

@@ -28,14 +28,14 @@ Please join our [Mailing list](https://groups.google.com/forum/#!forum/open-even
2828

2929
The Open Event Frontend can be easily deployed on a variety of platforms. Detailed platform specific instructions have been provided below.
3030

31-
1. [Local Installation](/docs/installation/local.md)
32-
1. [Publish to GitHub Pages](/docs/installation/Publish-to-GitHub-Pages.md)
33-
1. [Running in Docker](/docs/installation/docker.md)
31+
1. [Local Installation](/docs/installation/local.md)
32+
2. [Publish to GitHub Pages](/docs/installation/Publish-to-GitHub-Pages.md)
33+
3. [Running in Docker](/docs/installation/docker.md)
3434

3535
## Running / Development
3636

37-
* `ember serve`
38-
* Visit your app at [http://localhost:4200](http://localhost:4200).
37+
- `ember serve`
38+
- Visit your app at [http://localhost:4200](http://localhost:4200).
3939

4040
### Code Generators
4141

@@ -45,14 +45,13 @@ Make use of the many generators for code, try `ember help generate` for more det
4545

4646
This project has acceptance, integration and unit tests located inside the `tests/` folder.
4747

48-
* `ember test` - CLI output
49-
* `ember test --server` - Live browser preview and console access
48+
- `ember test` - CLI output
49+
- `ember test --server` - Live browser preview and console access
5050

5151
### Building
5252

53-
* `ember build` (development)
54-
* `ember build --environment production` (production)
55-
53+
- `ember build` (development)
54+
- `ember build --environment production` (production)
5655

5756
## Deployments, Docker images and Releases
5857

@@ -62,51 +61,55 @@ This project has acceptance, integration and unit tests located inside the `test
6261
The master branch of open-event-frontend gets deployed in a production environment at [https://eventyay.com](https://eventyay.com)
6362
It consumes the API exposed by master branch deployment of open event server, hosted at [https://api.eventyay.com](https://api.eventyay.com)
6463

65-
**Development branch**
64+
#### Development branch
6665

6766
The **development** branch of open-event-frontend gets deployed at [https://open-event-fe.netlify.com](https://open-event-fe.netlify.com)
6867
It consumes the API exposed by development branch of open event server, hosted at [https://open-event-api-dev.herokuapp.com](https://open-event-api-dev.herokuapp.com)
6968

70-
7169
### Release Cycle
7270

7371
Stable versions will released periodically, starting from version 1.0.0 when open-event-frontend went into production. Version names will follow [semantic versioning](https://semver.org/)
7472

7573
### Docker Hub Images
7674
Docker images hosted on [open-event-frontend repository](https://cloud.docker.com/u/eventyay/repository/docker/eventyay/open-event-frontend) under eventyay organisation on docker hub are updated for each push on master and developement branch. Separate tags for each version release are also maintained. They are as follows:
7775

78-
|Branch/Release | Image|
79-
|---|---|
80-
|Master| eventyay/open-event-frontend:latest|
81-
|Development | eventyay/open-event-frontend:development |
82-
|Version(vx.y.z) | eventyay/open-event-frontend:vx.y.z|
76+
| Branch/Release | Image |
77+
| --------------- | ---------------------------------------- |
78+
| Master | eventyay/open-event-frontend:latest |
79+
| Development | eventyay/open-event-frontend:development |
80+
| Version(vx.y.z) | eventyay/open-event-frontend:vx.y.z |
8381

8482
## Further Reading / Useful Links
85-
* [ember.js](https://emberjs.com/)
86-
* [ember-cli](https://ember-cli.com/)
87-
* [Semantic UI](https://semantic-ui.com/)
88-
* [Semantic-UI-Ember](https://semantic-org.github.io/Semantic-UI-Ember/)
89-
* Development Browser Extensions
90-
* [ember inspector for chrome](https://chrome.google.com/webstore/detail/ember-inspector/bmdblncegkenkacieihfhpjfppoconhi)
91-
* [ember inspector for firefox](https://addons.mozilla.org/en-US/firefox/addon/ember-inspector/)
83+
84+
- [ember.js](https://emberjs.com/)
85+
86+
- [ember-cli](https://ember-cli.com/)
87+
88+
- [Semantic UI](https://semantic-ui.com/)
89+
90+
- [Semantic-UI-Ember](https://semantic-org.github.io/Semantic-UI-Ember/)
91+
92+
- Development Browser Extensions
93+
- [ember inspector for chrome](https://chrome.google.com/webstore/detail/ember-inspector/bmdblncegkenkacieihfhpjfppoconhi)
94+
- [ember inspector for firefox](https://addons.mozilla.org/en-US/firefox/addon/ember-inspector/)
9295

9396
## Contributions Best Practices
9497

95-
**Commits**
98+
### Commits
9699

97-
* Write clear meaningful git commit messages (Do read https://chris.beams.io/posts/git-commit/)
98-
* Make sure your PR's description contains GitHub's special keyword references that automatically close the related issue when the PR is merged. (More info at https://github.com/blog/1506-closing-issues-via-pull-requests )
99-
* When you make very minor changes to a PR of yours (like for example fixing a failing Travis build or some small style corrections or minor changes requested by reviewers) make sure you squash your commits afterward so that you don't have an absurd number of commits for a very small fix. (Learn how to squash at https://davidwalsh.name/squash-commits-git )
100-
* When you're submitting a PR for a UI-related issue, it would be really awesome if you add a screenshot of your change or a link to a deployment where it can be tested out along with your PR. It makes it very easy for the reviewers and you'll also get reviews quicker.
100+
- Write clear meaningful git commit messages (Do read [https://chris.beams.io/posts/git-commit/](https://chris.beams.io/posts/git-commit/))
101+
- Make sure your PR's description contains GitHub's special keyword references that automatically close the related issue when the PR is merged. (More info at [https://github.com/blog/1506-closing-issues-via-pull-requests](https://github.com/blog/1506-closing-issues-via-pull-requests) )
102+
- When you make very minor changes to a PR of yours (like for example fixing a failing Travis build or some small style corrections or minor changes requested by reviewers) make sure you squash your commits afterward so that you don't have an absurd number of commits for a very small fix. (Learn how to squash at [https://davidwalsh.name/squash-commits-git](https://davidwalsh.name/squash-commits-git) )
103+
- When you're submitting a PR for a UI-related issue, it would be really awesome if you add a screenshot of your change or a link to a deployment where it can be tested out along with your PR. It makes it very easy for the reviewers and you'll also get reviews quicker.
101104

102-
**Feature Requests and Bug Reports**
105+
### Feature Requests and Bug Reports
103106

104107
When you file a feature request or when you are submitting a bug report to the [issue tracker](https://github.com/fossasia/open-event-frontend/issues), make sure you add steps to reproduce it. Especially if that bug is some weird/rare one.
105108

106-
**Join the development**
109+
### Join the development
107110

108-
* Before you join development, please set up the project on your local machine, run it and go through the application completely. Press on any button you can find and see where it leads to. Explore. (Don't worry ... Nothing will happen to the app or to you due to the exploring :wink: Only thing that will happen is, you'll be more familiar with what is where and might even get some cool ideas on how to improve various aspects of the app.)
109-
* If you would like to work on an issue, drop in a comment at the issue. If it is already assigned to someone, but there is no sign of any work being done, please feel free to drop in a comment so that the issue can be assigned to you if the previous assignee has dropped it entirely.
111+
- Before you join development, please set up the project on your local machine, run it and go through the application completely. Press on any button you can find and see where it leads to. Explore. (Don't worry ... Nothing will happen to the app or to you due to the exploring :wink: Only thing that will happen is, you'll be more familiar with what is where and might even get some cool ideas on how to improve various aspects of the app.)
112+
- If you would like to work on an issue, drop in a comment at the issue. If it is already assigned to someone, but there is no sign of any work being done, please feel free to drop in a comment so that the issue can be assigned to you if the previous assignee has dropped it entirely.
110113

111114
## License
112115

app/components/forms/events/view/create-access-code.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ export default Component.extend(FormMixin, {
102102
accessLink : computed('data.code', function() {
103103
const params = this.get('router._router.currentState.routerJsState.params');
104104
const origin = this.get('fastboot.isFastBoot') ? `${this.get('fastboot.request.protocol')}//${this.get('fastboot.request.host')}` : location.origin;
105-
let link = origin + this.router.urlFor('public', params['events.view'].event_id, { queryParams: { access_code: this.get('data.code') } });
105+
let link = origin + this.router.urlFor('public', params['events.view'].event_id, { queryParams: { code: this.get('data.code') } });
106106
this.set('data.accessUrl', link);
107107
return link;
108108
}),

app/components/forms/orders/order-form.js

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import {
1111
validGithubProfileUrlPattern
1212
} from 'open-event-frontend/utils/validators';
1313
import { genders } from 'open-event-frontend/utils/dictionary/genders';
14+
import { ageGroups } from 'open-event-frontend/utils/dictionary/age-groups';
1415

1516
export default Component.extend(FormMixin, {
1617
router: service(),
@@ -100,6 +101,15 @@ export default Component.extend(FormMixin, {
100101
]
101102
};
102103

104+
let ageGroupValidation = {
105+
rules: [
106+
{
107+
type : 'empty',
108+
prompt : this.l10n.t('Please select your age group')
109+
}
110+
]
111+
};
112+
103113
let addressValidation = {
104114
rules: [
105115
{
@@ -131,7 +141,7 @@ export default Component.extend(FormMixin, {
131141
rules: [
132142
{
133143
type : 'empty',
134-
prompt : this.l10n.t('Please enter your country')
144+
prompt : this.l10n.t('Please select your country')
135145
}
136146
]
137147
};
@@ -379,7 +389,7 @@ export default Component.extend(FormMixin, {
379389
rules : [
380390
{
381391
type : 'empty',
382-
prompt : this.l10n.t('Please enter your country')
392+
prompt : this.l10n.t('Please select your country')
383393
}
384394
]
385395
},
@@ -435,6 +445,7 @@ export default Component.extend(FormMixin, {
435445
validationRules.fields[`lastname_required_${index}`] = lastNameValidation;
436446
validationRules.fields[`email_required_${index}`] = emailValidation;
437447
validationRules.fields[`gender_required_${ index}`] = genderValidation;
448+
validationRules.fields[`ageGroup_required_${ index}`] = ageGroupValidation;
438449
validationRules.fields[`address_required_${ index}`] = addressValidation;
439450
validationRules.fields[`city_required_${ index}`] = cityValidation;
440451
validationRules.fields[`state_required_${ index}`] = stateValidation;
@@ -466,7 +477,8 @@ export default Component.extend(FormMixin, {
466477
return groupBy(this.fields.toArray(), field => field.get('form'));
467478
}),
468479

469-
genders: orderBy(genders, 'name'),
480+
genders : orderBy(genders, 'name'),
481+
ageGroups : orderBy(ageGroups, 'age'),
470482

471483
actions: {
472484
submit(data) {

app/components/forms/wizard/basic-details-step.js

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -353,6 +353,15 @@ export default Component.extend(FormMixin, EventWizardMixin, {
353353
prompt : this.l10n.t('Please enter a valid url')
354354
}
355355
]
356+
},
357+
paymentCountry: {
358+
identifier : 'payment_country',
359+
rules : [
360+
{
361+
type : 'empty',
362+
prompt : this.l10n.t('Please select your country')
363+
}
364+
]
356365
}
357366
}
358367
};

app/components/forms/wizard/sessions-speakers-step.js

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,24 @@ export default Component.extend(EventWizardMixin, FormMixin, {
8686
prompt : this.l10n.t('Please give an end time')
8787
}
8888
]
89+
},
90+
microlocation: {
91+
identifier : 'microlocation',
92+
rules : [
93+
{
94+
type : 'empty',
95+
prompt : this.l10n.t('Please enter name for microlocation')
96+
}
97+
]
98+
},
99+
microlocationFloor: {
100+
identifier : 'microlocation_floor',
101+
rules : [
102+
{
103+
type : 'empty',
104+
prompt : this.l10n.t('Please enter floor for microlocation')
105+
}
106+
]
89107
}
90108
}
91109
};

app/components/modals/tax-info-modal.js

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,15 @@ export default ModalBase.extend(FormMixin, {
104104
prompt : this.l10n.t('Please provide a zip code')
105105
}
106106
]
107+
},
108+
taxCountry: {
109+
identifier : 'tax_country',
110+
rules : [
111+
{
112+
type : 'empty',
113+
prompt : this.l10n.t('Please select your country')
114+
}
115+
]
107116
}
108117
}
109118
};

app/controllers/admin/events/list.js

Lines changed: 33 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,11 +85,21 @@ export default class extends Controller.extend(EmberTableControllerMixin) {
8585
name : 'Featured Event',
8686
valuePath : 'id',
8787
extraValuePaths : ['isFeatured'],
88-
cellComponent : 'ui-table/cell/admin/event-is-featured',
88+
cellComponent : 'ui-table/cell/admin/events/event-is-featured',
8989
width : 80,
9090
actions : {
9191
toggleFeatured: this.toggleFeatured.bind(this)
9292
}
93+
},
94+
{
95+
name : 'Promoted Event',
96+
valuePath : 'id',
97+
extraValuePaths : ['isPromoted'],
98+
cellComponent : 'ui-table/cell/admin/events/event-is-promoted',
99+
width : 80,
100+
actions : {
101+
togglePromoted: this.togglePromoted.bind(this)
102+
}
93103
}
94104
];
95105
}
@@ -124,6 +134,7 @@ export default class extends Controller.extend(EmberTableControllerMixin) {
124134
{
125135
id: 'event_del_succ'
126136
});
137+
this.refreshModel.bind(this)();
127138
} catch (e) {
128139
console.warn(e);
129140
this.notify.error(this.l10n.t('An unexpected error has occurred.'),
@@ -178,4 +189,25 @@ export default class extends Controller.extend(EmberTableControllerMixin) {
178189
}
179190
this.set('isLoading', false);
180191
}
192+
193+
@action
194+
async togglePromoted(event_id) {
195+
this.set('isLoading', true);
196+
try {
197+
let event = this.store.peekRecord('event', event_id, { backgroundReload: false });
198+
event.toggleProperty('isPromoted');
199+
await event.save();
200+
this.notify.success(this.l10n.t(`Event ${event.isPromoted ? 'Promoted' : 'unpromoted'} Successfully`),
201+
{
202+
id: 'event_detail_changed'
203+
});
204+
} catch (e) {
205+
console.warn(e);
206+
this.notify.error(this.l10n.t('An unexpected error has occurred.'),
207+
{
208+
id: 'event_det_error'
209+
});
210+
}
211+
this.set('isLoading', false);
212+
}
181213
}

0 commit comments

Comments
 (0)