Skip to content
This repository was archived by the owner on Dec 8, 2022. It is now read-only.

Commit 86e41a1

Browse files
authored
Merge pull request #155 from hackuci/bug-lottery
Fixed lottery bugs. Centered text and cleared irrelevant text.
2 parents 606b867 + eab7b9e commit 86e41a1

File tree

5 files changed

+7204
-17081
lines changed

5 files changed

+7204
-17081
lines changed

app/client/src/constants.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ angular.module('reg')
1313
.constant('DASHBOARD', {
1414
UNVERIFIED: 'You should have received an email asking you verify your email. Click the link in the email and you can start your application!',
1515
INCOMPLETE_TITLE: 'You still need to complete your application!',
16-
INCOMPLETE: 'If you do not complete your application before the [APP_DEADLINE], you will not be considered for the admissions lottery!',
16+
INCOMPLETE: 'If you do not complete your application before the [APP_DEADLINE], you will not be considered for admissions!',
1717
SUBMITTED_TITLE: 'Your application has been submitted!',
1818
SUBMITTED: 'Feel free to edit it at any time. However, once registration is closed, you will not be able to edit it any further.\nPlease make sure your information is accurate before registration is closed!',
19-
CLOSED_AND_INCOMPLETE_TITLE: 'Unfortunately, registration has closed, and the lottery process has begun.',
20-
CLOSED_AND_INCOMPLETE: 'Because you have not completed your profile in time, you will not be eligible for the lottery process.',
19+
CLOSED_AND_INCOMPLETE_TITLE: 'Unfortunately, registration has closed, and the admissions process has begun.',
20+
CLOSED_AND_INCOMPLETE: '',
2121
ADMITTED_AND_CAN_CONFIRM_TITLE: 'You must confirm by [CONFIRM_DEADLINE].',
2222
ADMITTED_AND_CANNOT_CONFIRM_TITLE: 'Your confirmation deadline of [CONFIRM_DEADLINE] has passed.',
2323
ADMITTED_AND_CANNOT_CONFIRM: 'Although you were accepted, you did not complete your confirmation in time.\nUnfortunately, this means that you will not be able to attend the event, as we must begin to accept other applicants on the waitlist.\nWe hope to see you again next year!',

app/client/stylesheets/_dashboard.scss

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,4 +76,10 @@
7676
}
7777
}
7878
}
79+
80+
#closed-and-incomplete {
81+
display: flex;
82+
flex-direction: column;
83+
align-items: center;
84+
}
7985
}

app/client/views/dashboard/dashboard.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@
109109

110110
</div>
111111

112-
<div
112+
<div id="closed-and-incomplete"
113113
ng-if="dashState('closedAndIncomplete')">
114114
<p>
115115
<strong>

bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"name": "JAFRS",
2+
"name": "jafrs",
33
"version": "0.0.0",
44
"homepage": "https://github.com/techx/hackmit-registration",
55
"authors": [

0 commit comments

Comments
 (0)