Skip to content

Commit 2482337

Browse files
pavnesh-cpavnesh-c
committed
Merge branch 'development' of https://github.com/fossasia/open-event-frontend into group-permissions
2 parents 5d55ee7 + 9f6b69f commit 2482337

File tree

12 files changed

+361
-334
lines changed

12 files changed

+361
-334
lines changed

‎app/components/forms/events/view/videoroom-form.js‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,9 @@ export default class VideoroomForm extends Component.extend(FormMixin) {
256256
this.onValid(async() => {
257257
try {
258258
this.set('isLoading', true);
259-
this.data.stream.extra.bbb_options.endCurrentMeeting = this.showUpdateOptions ? this.endCurrentMeeting : false;
259+
if (this.data.stream.extra.bbb_options) {
260+
this.data.stream.extra.bbb_options.endCurrentMeeting = this.showUpdateOptions ? this.endCurrentMeeting : false;
261+
}
260262
await this.data.stream.save();
261263
const saveModerators = this.data.stream.moderators.toArray().map(moderator => {
262264
if (moderator.id) {

‎app/controllers/public/index.js‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,10 @@ import classic from 'ember-classic-decorator';
22
import { action, computed } from '@ember/object';
33
import Controller from '@ember/controller';
44
import { htmlSafe } from '@ember/string';
5+
import { tracked } from '@glimmer/tracking';
56
import ENV from 'open-event-frontend/config/environment';
67

8+
79
@classic
810
export default class IndexController extends Controller {
911
queryParams = ['code'];
@@ -12,6 +14,8 @@ export default class IndexController extends Controller {
1214
isContactOrganizerModalOpen = false;
1315
userExists = false;
1416

17+
@tracked selectedRegistration = null;
18+
1519
@computed('model.event.description')
1620
get htmlSafeDescription() {
1721
return htmlSafe(this.model.event.description);
@@ -125,6 +129,11 @@ export default class IndexController extends Controller {
125129
this.set('isContactOrganizerModalOpen', true);
126130
}
127131

132+
@action
133+
selectTicket(ticket) {
134+
this.selectedRegistration = ticket;
135+
}
136+
128137
@action
129138
async oneClickSignup(ticket) {
130139
const input = {

‎app/styles/partials/utils.scss‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,11 @@
133133
margin-top: .5rem !important;
134134
}
135135

136+
.mx-4 {
137+
margin-left: 1rem !important;
138+
margin-right: 1rem !important;
139+
}
140+
136141
.mt-4 {
137142
margin-top: 1rem !important;
138143
}

‎app/templates/components/group-header.hbs‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
<div class="row">
2+
<div class="column">
3+
<div class="ui warning message mt-4 mb--1">
4+
<div class="header">
5+
{{t 'This feature is still in alpha stage'}}
6+
</div>
7+
{{t 'Please use with care.'}} {{t 'Thank You.'}}
8+
</div>
9+
</div>
10+
</div>
111
<div class="row">
212
<div class="sixteen wide column">
313
<div class="ui grid space-between items-center mt-4 mb-4">

‎app/templates/components/group-nav.hbs‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,15 @@
44
<h2>
55
{{@group.name}}
66
</h2>
7-
<a
8-
href="/groups/{{@group.id}}"
9-
target="_blank" rel="noopener"
10-
class="ui button labeled icon small mr-4 green" >
11-
<i class="unhide icon"></i>
12-
{{t 'View'}}
13-
</a>
7+
{{#if (not @createPage)}}
8+
<a
9+
href="/g/{{@group.id}}"
10+
target="_blank" rel="noopener"
11+
class="ui button labeled icon small mr-4 green" >
12+
<i class="unhide icon"></i>
13+
{{t 'View'}}
14+
</a>
15+
{{/if}}
1416
</div>
1517
<TabbedNavigation>
1618
{{#if @team}}

‎app/templates/components/tables/default.hbs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
</div>
88
{{/unless}}
99
{{#unless @hideSearchBox}}
10-
<div class="eight wide right aligned column">
10+
<div class="eight wide right aligned column pr-0">
1111
<Tables::Utilities::SearchBox
1212
@searchQuery={{this.searchQuery}}
1313
@filterOptions={{this.filterOptions}} />

‎app/templates/groups/edit/followers.hbs‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,10 @@
3030
</div>
3131
<div class="sixteen wide column">
3232
<div class="mb-4 d-flex items-center space-between">
33-
<h2 class="header">{{t 'Followers'}}</h2>
33+
<h2 class="header mb-0 pb-0">{{t 'Followers'}}</h2>
3434
<button class="ui blue button right-floated {{if this.isLoading 'loading'}}" {{action 'export' this.router.currentRoute.params.group_id}} >{{t 'Export as CSV'}}</button>
35-
</div>
35+
</div>
36+
<div class="mx-4">
3637
<Tables::Default
3738
@columns={{this.followersColumn}}
3839
@rows={{this.model.followers.data}}
@@ -44,4 +45,5 @@
4445
@widthConstraint="eq-container"
4546
@resizeMode="fluid"
4647
@fillMode="equal-column" />
48+
</div>
4749
</div>

‎app/templates/public/index.hbs‎

Lines changed: 40 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -6,37 +6,53 @@
66
<div class="ui hidden divider"></div>
77
{{/if}}
88
{{#if (and this.model.event.isOneclickSignupEnabled this.model.tickets)}}
9-
<h2>{{t 'Registration for event.'}}</h2>
10-
<table class="ui single line table stackable" style="margin-bottom: 0;width:50%">
11-
<thead class="full-width">
12-
<tr>
13-
<th>{{t 'Name'}} <i class="ticket alternate icon"></i> </th>
14-
<th>{{t 'Type'}}</th>
15-
<th></th>
16-
</tr>
17-
</thead>
18-
{{#each this.model.tickets as |ticket| }}
19-
<tbody>
9+
<h2>{{t 'Registration'}}</h2>
10+
{{!-- template-lint-disable style-concatenation --}}
11+
<table class="ui table stackable" style="max-width:{{if device.isMobile '100%' '50%'}}">
12+
{{#each (sort-by 'position' this.model.tickets) as |ticket| }}
13+
{{!-- template-lint-disable no-invalid-interactive --}}
14+
<tbody onclick={{action "selectTicket" ticket}} style="cursor:pointer">
2015
{{#if (includes ticket.type 'Registration')}}
2116
<tr>
22-
<td>{{ticket.name}}</td>
17+
<td>
18+
<i role="button" class="circle {{if (eq this.selectedRegistration ticket) 'blue' 'outline'}} large icon"></i>
19+
{{ticket.name}}
20+
<br/>
21+
<small class="ui gray-text tiny">({{ticket.description}})</small>
22+
<br>
23+
{{#if (and this.model.tax (not-eq ticket.type 'freeRegistration'))}}
24+
<p>
25+
{{#if this.model.tax.isTaxIncludedInPrice}}
26+
<small class="ui gray-text small">
27+
{{t 'includes'}} <CurrencyAmount @currency={{this.model.event.paymentCurrency}} @amount={{ticket.includedTaxAmount}}/>
28+
</small>
29+
{{else}}
30+
<small class="ui gray-text small">
31+
+ <CurrencyAmount @currency={{this.eventCurrency}} @amount={{sub ticket.ticketPriceWithTax ticket.price}}/>
32+
</small>
33+
{{/if}}
34+
<span>
35+
<small class="ui gray-text tiny aligned right">({{this.model.tax.name}})</small>
36+
</span>
37+
</p>
38+
{{/if}}
39+
</td>
2340
<td>
2441
{{#if (includes ticket.type 'free')}}
2542
{{t 'Free'}}
2643
{{else if (includes ticket.type 'paid')}}
27-
{{t 'Paid'}}
44+
<CurrencyAmount @amount={{ticket.price}} @currency={{this.model.event.paymentCurrency}} />
2845
{{else}}
2946
{{t 'Donation'}}
3047
{{/if}}
3148
</td>
32-
<td>
33-
<i role="button" {{action "oneClickSignup" ticket}} class="arrow circle right large violet icon"></i>
34-
</td>
3549
</tr>
3650
{{/if}}
3751
</tbody>
3852
{{/each}}
3953
</table>
54+
<br/>
55+
<button class="ui blue button {{if (not this.selectedRegistration) 'disabled'}}" style="height:50px;width:{{if device.isMobile '100%' '50%'}}" onclick={{pipe-action (action "oneClickSignup" this.selectedRegistration) (action this.placeOrder 0)}}> {{t 'Register Now'}} </button>
4056
{{else}}
4157
{{#if (or this.model.event.ticketUrl this.model.tickets)}}
4258
<div class="tickets mt-16" id="tickets">
@@ -125,3 +141,11 @@
125141
</div>
126142
{{/if}}
127143
</div>
144+
145+
<Modals::LoginSignupModal
146+
@isOpen={{this.isLoginModalOpen}}
147+
@isLoading={{this.isLoading}}
148+
@createNewUserViaEmail={{this.createNewUserViaEmail}}
149+
@loginExistingUser={{this.loginExistingUser}}
150+
@userExists={{this.userExists}}
151+
@errorMessage={{this.errorMessage}} />

‎app/templates/public/sessions.hbs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@
125125
{{else}}
126126
<div class="ui disabled header">{{t 'No Sessions exist for this time period'}}</div>
127127
{{/if}}
128-
<InfinityLoader @infinityModel={{this.model.session}} @triggerOffset={{1000}} @eventDebounce={{50}}>
128+
<InfinityLoader @infinityModel={{this.model.session}} @triggerOffset={{100}} @eventDebounce={{200}}>
129129
<div class="center aligned five wide column">
130130
<div class="ui loading very padded basic segment">
131131
</div>

‎package.json‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
]
2929
},
3030
"devDependencies": {
31-
"@babel/core": "^7.15.0",
31+
"@babel/core": "^7.15.4",
3232
"@babel/plugin-proposal-object-rest-spread": "^7.14.7",
3333
"@babel/plugin-transform-block-scoping": "^7.15.3",
3434
"@ember/jquery": "^2.0.0",
@@ -37,9 +37,9 @@
3737
"@glimmer/component": "^1.0.4",
3838
"@glimmer/tracking": "^1.0.4",
3939
"@open-event/theme": "^0.2.2",
40-
"@sentry/browser": "^6.11.0",
41-
"@sentry/integrations": "^6.11.0",
42-
"@sentry/tracing": "^6.11.0",
40+
"@sentry/browser": "^6.12.0",
41+
"@sentry/integrations": "^6.12.0",
42+
"@sentry/tracing": "^6.12.0",
4343
"@types/ember": "^3.16.5",
4444
"@types/ember-data": "^3.16.15",
4545
"@types/ember-data__model": "^3.16.1",
@@ -50,8 +50,8 @@
5050
"@types/qunit": "^2.11.2",
5151
"@types/rsvp": "^4.0.4",
5252
"@types/url-parse": "^1.4.4",
53-
"@typescript-eslint/eslint-plugin": "^4.29.3",
54-
"@typescript-eslint/parser": "^4.29.3",
53+
"@typescript-eslint/eslint-plugin": "^4.30.0",
54+
"@typescript-eslint/parser": "^4.30.0",
5555
"async": "^3.2.1",
5656
"babel-eslint": "^10.1.0",
5757
"broccoli-asset-rev": "^3.0.0",
@@ -62,7 +62,7 @@
6262
"ember-ajax": "5.0.0",
6363
"ember-auto-import": "^1.11.3",
6464
"ember-classic-decorator": "^2.0.0",
65-
"ember-cli": "~3.27.0",
65+
"ember-cli": "~3.28.0",
6666
"ember-cli-accounting": "^2.0.2",
6767
"ember-cli-app-version": "^5.0.0",
6868
"ember-cli-autoprefixer": "1.0.3",
@@ -145,26 +145,26 @@
145145
"leaflet": "^1.6.0",
146146
"loader.js": "^4.7.0",
147147
"lodash-es": "^4.17.21",
148-
"mini-css-extract-plugin": "^2.2.0",
148+
"mini-css-extract-plugin": "^2.2.2",
149149
"moment-timezone": "^0.5.31",
150150
"npm-run-all": "^4.1.5",
151151
"object-to-formdata": "^4.1.0",
152152
"paypal-checkout": "^4.0.331",
153153
"pre-commit": "^1.2.2",
154154
"query-string": "^7.0.1",
155-
"qunit-dom": "^1.6.0",
156-
"sass": "^1.38.1",
155+
"qunit-dom": "^2.0.0",
156+
"sass": "^1.39.0",
157157
"semantic-ui-calendar": "^0.0.8",
158158
"semantic-ui-ember": "3.0.5",
159159
"string_decoder": "^1.3.0",
160160
"style-loader": "^2.0.0",
161161
"tinyColorPicker": "https://github.com/PitPik/tinyColorPicker#1.1.1",
162162
"torii": "^0.10.1",
163-
"typescript": "^4.3.5",
163+
"typescript": "^4.4.2",
164164
"url-parse": "^1.5.3",
165165
"webpack-bundle-analyzer": "^4.4.2",
166166
"wysihtml": "^0.5.5",
167-
"xgettext-template": "^4.1.0"
167+
"xgettext-template": "^4.1.1"
168168
},
169169
"engines": {
170170
"node": ">= 12.x",

0 commit comments

Comments
 (0)