Skip to content

Commit a5ffd87

Browse files
iamareebjamaliamareebjamal
authored
chore: Release v1.7.0 (#3734)
chore: Release v1.7.0
2 parents 2585786 + e9b4170 commit a5ffd87

File tree

16 files changed

+270
-122
lines changed

16 files changed

+270
-122
lines changed

‎Dockerfile

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
FROM node:10-alpine as builder
2-
LABEL maintainer="Niranjan Rajendran <[email protected]>"
1+
FROM node:12-alpine as builder
32

43
WORKDIR /app
54

@@ -25,16 +24,18 @@ FROM node:10-alpine
2524

2625
WORKDIR /fastboot
2726

28-
COPY scripts/fastboot-server.js .
29-
COPY --from=builder /app/dist/ app/
27+
COPY --from=builder /app/dist/ dist/
3028

3129
RUN apk add --no-cache ca-certificates && \
32-
cp app/package.json . && \
30+
cp dist/package.json . && \
3331
yarn install && \
34-
yarn add fastboot-app-server && \
32+
yarn add fastboot-app-server dotenv lodash safe-eval && \
3533
rm -rf yarn.lock && \
3634
yarn cache clean
3735

36+
COPY scripts/* ./scripts/
37+
COPY config/environment.js ./config/
38+
3839
EXPOSE 4000
3940

40-
CMD ["node", "fastboot-server.js"]
41+
CMD ["node", "./scripts/fastboot-server.js"]

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
![Open Event Frontend](docs/images/Frontend_Branding.png)
33

44
[![Build Status](https://travis-ci.org/fossasia/open-event-frontend.svg?branch=development)](https://travis-ci.org/fossasia/open-event-frontend)
5-
[![Netlify Status](https://api.netlify.com/api/v1/badges/89d57fdc-826c-400b-af13-c542e9513f62/deploy-status)](https://app.netlify.com/sites/open-event-fe/deploys)
5+
[![Netlify](https://img.shields.io/netlify/89d57fdc-826c-400b-af13-c542e9513f62)](https://app.netlify.com/sites/open-event-fe/deploys)
66
[![Gitter](https://img.shields.io/badge/chat-on%20gitter-ff006f.svg?style=flat-square)](https://gitter.im/fossasia/open-event-frontend)
77
[![Mailing](https://img.shields.io/badge/Mailing-List-red.svg)](https://groups.google.com/forum/#!forum/open-event)
88
[![Codacy Badge](https://api.codacy.com/project/badge/Grade/0d51cf60fc734d3699fd6eff6054e483)](https://www.codacy.com/app/fossasia/open-event-frontend?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=fossasia/open-event-frontend&amp;utm_campaign=Badge_Grade)

‎app/controllers/events/view/edit/attendee.js

Lines changed: 31 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,41 @@
11
import Controller from '@ember/controller';
2-
import { action } from '@ember/object';
32
import EventWizardMixin from 'open-event-frontend/mixins/event-wizard';
43

5-
export default class extends Controller.extend(EventWizardMixin) {
6-
4+
export default Controller.extend(EventWizardMixin, {
75
async saveForms(data) {
86
for (const customForm of data.customForms ? data.customForms.toArray() : []) {
97
await customForm.save();
108
}
119
return data;
12-
}
13-
@action
14-
async save(data) {
15-
try {
16-
await this.saveForms(data);
17-
this.saveEventDataAndRedirectTo(
18-
'events.view.index',
19-
['tickets']
20-
);
21-
} catch (error) {
22-
this.notify.error(this.l10n.t(error.message),
23-
{
24-
id: 'attendee_error_serv'
25-
});
26-
}
27-
}
28-
@action
29-
async move(direction, data) {
30-
try {
31-
await this.saveForms(data);
32-
this.saveEventDataAndRedirectTo(
33-
direction === 'forwards' ? 'events.view.edit.sponsors' : 'events.view.edit.basic-details',
34-
['tickets']
35-
);
36-
} catch (error) {
37-
this.notify.error(this.l10n.t(error.message),
38-
{
39-
id: 'attendee_move_error'
40-
});
10+
},
11+
actions: {
12+
async save(data) {
13+
try {
14+
await this.saveForms(data);
15+
this.saveEventDataAndRedirectTo(
16+
'events.view.index',
17+
['tickets']
18+
);
19+
} catch (error) {
20+
this.notify.error(this.l10n.t(error.message),
21+
{
22+
id: 'attendee_error_serv'
23+
});
24+
}
25+
},
26+
async move(direction, data) {
27+
try {
28+
await this.saveForms(data);
29+
this.saveEventDataAndRedirectTo(
30+
direction === 'forwards' ? 'events.view.edit.sponsors' : 'events.view.edit.basic-details',
31+
['tickets']
32+
);
33+
} catch (error) {
34+
this.notify.error(this.l10n.t(error.message),
35+
{
36+
id: 'attendee_move_error'
37+
});
38+
}
4139
}
4240
}
43-
}
41+
});

‎app/controllers/events/view/edit/basic-details.js

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,19 @@
11
import Controller from '@ember/controller';
22
import EventWizardMixin from 'open-event-frontend/mixins/event-wizard';
3-
import { action } from '@ember/object';
43

5-
export default class extends Controller.extend(EventWizardMixin) {
6-
@action
7-
save() {
8-
this.saveEventDataAndRedirectTo(
9-
'events.view.index',
10-
['tickets', 'socialLinks', 'copyright', 'tax', 'stripeAuthorization']
11-
);
4+
export default Controller.extend(EventWizardMixin, {
5+
actions: {
6+
save() {
7+
this.saveEventDataAndRedirectTo(
8+
'events.view.index',
9+
['tickets', 'socialLinks', 'copyright', 'tax', 'stripeAuthorization']
10+
);
11+
},
12+
move() {
13+
this.saveEventDataAndRedirectTo(
14+
'events.view.edit.attendee',
15+
['tickets', 'socialLinks', 'copyright', 'tax', 'stripeAuthorization']
16+
);
17+
}
1218
}
13-
@action
14-
move() {
15-
this.saveEventDataAndRedirectTo(
16-
'events.view.edit.attendee',
17-
['tickets', 'socialLinks', 'copyright', 'tax', 'stripeAuthorization']
18-
);
19-
}
20-
}
21-
19+
});

‎app/controllers/events/view/edit/sessions-speakers.js

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,31 @@
11
import Controller from '@ember/controller';
2-
import { action } from '@ember/object';
32
import EventWizardMixin from 'open-event-frontend/mixins/event-wizard';
43

5-
export default class extends Controller.extend(EventWizardMixin) {
4+
export default Controller.extend(EventWizardMixin, {
65

76
async saveEventData() {
87
const event = await this._super(...arguments);
98

10-
event.isSessionsSpeakersEnabled
11-
? await this.model.speakersCall.save()
12-
: await this.model.speakersCall.destroyRecord();
9+
event.get('isSessionsSpeakersEnabled')
10+
? await this.get('model.speakersCall').save()
11+
: await this.get('model.speakersCall').destroyRecord();
1312

1413
return event;
15-
}
14+
},
1615

17-
@action
18-
save() {
19-
this.saveEventDataAndRedirectTo(
20-
'events.view.index',
21-
['tracks', 'sessionTypes', 'microlocations', 'customForms', 'tickets']
22-
);
23-
}
24-
@action
25-
move(direction) {
26-
this.saveEventDataAndRedirectTo(
27-
direction === 'forwards' ? 'events.view.edit.sponsors' : 'events.view.edit.sponsors',
28-
['tracks', 'sessionTypes', 'microlocations', 'customForms', 'tickets']
29-
);
16+
17+
actions: {
18+
save() {
19+
this.saveEventDataAndRedirectTo(
20+
'events.view.index',
21+
['tracks', 'sessionTypes', 'microlocations', 'customForms', 'tickets']
22+
);
23+
},
24+
move(direction) {
25+
this.saveEventDataAndRedirectTo(
26+
direction === 'forwards' ? 'events.view.edit.sponsors' : 'events.view.edit.sponsors',
27+
['tracks', 'sessionTypes', 'microlocations', 'customForms', 'tickets']
28+
);
29+
}
3030
}
31-
}
31+
});

‎app/controllers/events/view/edit/sponsors.js

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
import Controller from '@ember/controller';
22
import EventWizardMixin from 'open-event-frontend/mixins/event-wizard';
3-
import { action } from '@ember/object';
43

5-
export default class extends Controller.extend(EventWizardMixin) {
4+
export default Controller.extend(EventWizardMixin, {
65

7-
@action
8-
save() {
9-
this.saveEventDataAndRedirectTo(
10-
'events.view.index',
11-
['sponsors', 'tickets']
12-
);
6+
actions: {
7+
save() {
8+
this.saveEventDataAndRedirectTo(
9+
'events.view.index',
10+
['sponsors', 'tickets']
11+
);
12+
},
13+
move(direction) {
14+
this.saveEventDataAndRedirectTo(
15+
direction === 'forwards' ? 'events.view.edit.sessions-speakers' : 'events.view.edit.attendee',
16+
['sponsors', 'tickets']
17+
);
18+
}
1319
}
14-
@action
15-
move(direction) {
16-
this.saveEventDataAndRedirectTo(
17-
direction === 'forwards' ? 'events.view.edit.sessions-speakers' : 'events.view.edit.attendee',
18-
['sponsors', 'tickets']
19-
);
20-
}
21-
}
20+
21+
});

‎app/routes/public/cfs/new-session.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ export default Route.extend({
1111
event : eventDetails,
1212
forms : await eventDetails.query('customForms', {
1313
sort : 'id',
14-
'page[size]' : 50
14+
'page[size]' : 0
1515
}),
1616
session: await this.store.createRecord('session', {
1717
event : eventDetails,

‎app/templates/components/forms/session-speaker-form.hbs

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,18 @@
159159
{{/each}}
160160
</div>
161161
{{/ui-dropdown}}
162+
{{else if (eq field.fieldIdentifier 'gender')}}
163+
{{#ui-dropdown class='search selection' selected=data.speaker.gender onChange=(action (mut data.speaker.gender)) as |execute mapper|}}
164+
<i class="dropdown icon"></i>
165+
<div class="default text">{{t 'Select your gender'}}</div>
166+
<div class="menu">
167+
{{#each genders as |gender|}}
168+
<div class="item" data-value="{{map-value mapper gender.name}}">
169+
{{gender.name}}
170+
</div>
171+
{{/each}}
172+
</div>
173+
{{/ui-dropdown}}
162174
{{else}}
163175
{{#ui-dropdown class='search selection' onChange=(action (mut (get data.speaker field.fieldIdentifier))) as |execute mapper|}}
164176
<i class="dropdown icon"></i>

‎app/templates/components/forms/wizard/sessions-speakers-step.hbs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,7 @@
316316
{{else}}
317317
<div class="spacer-50"></div>
318318
{{/if}}
319-
319+
{{!-- Hiding the Custom Widget Form, Until it is ready to be deployed for Development & Production.
320320
{{#each complexCustomForms as |form|}}
321321
{{form.isComplex}}
322322
<div class="fields">
@@ -355,7 +355,7 @@
355355
356356
<button type="button" class="ui primary {{if device.isMobile 'small'}} button" {{action 'addCustomField'}}>{{t 'Add another custom field'}}</button>
357357
358-
358+
--}}
359359
<div class="ui fields buttons {{if device.isMobile 'mini three' 'right floated large'}}">
360360
<button class="ui three field left labeled icon button {{if isLoading 'disabled'}}" type="button" {{action 'move' 'backwards'}}>
361361
{{t 'Previous'}}

‎app/templates/components/modals/cfs-proposal-modal.hbs

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3,28 +3,9 @@
33
{{t 'Submit Proposal'}}
44
</div>
55
<div class="content">
6-
<h4 class="ui header">{{t 'Existing Sessions'}}</h4>
7-
{{#unless isNewSpeaker}}
8-
{{#unless isNewSession}}
9-
<div class="ui list">
10-
{{#each data.userSession as |session|}}
11-
{{#if session.id}}
12-
{{#link-to 'public.cfs.edit-session' session.id invokeAction=(action 'toggleView')}}
13-
<div class="item">
14-
<i class="right triangle icon"></i>
15-
{{t 'Edit Session - '}}{{session.title}}
16-
</div>
17-
{{/link-to}}
18-
{{/if}}
19-
{{/each}}
20-
</div>
21-
{{/unless}}
22-
{{/unless}}
236
{{#if isNewSession}}
247
<p>{{t 'No existing sessions'}}</p>
258
{{/if}}
26-
<div class="ui hidden divider">
27-
</div>
289
<div>
2910
{{#if isNewSpeaker}}
3011
{{#link-to 'public.cfs.new-speaker' class='ui teal button' invokeAction=(action 'toggleView')}}
@@ -41,7 +22,7 @@
4122
{{/if}}
4223
{{#unless isNewSpeaker}}
4324
{{#link-to 'public.cfs.new-session' invokeAction=(action 'toggleView')}}
44-
<button class="ui teal {{if device.isMobile 'tiny'}} button">{{t 'Add Session'}}</button>
25+
<button class="ui teal {{if device.isMobile 'tiny'}} button">{{t 'Add New Session'}}</button>
4526
{{/link-to}}
4627
{{/unless}}
4728
</div>

0 commit comments

Comments
 (0)