Skip to content

Commit

Permalink
Subscription feature (#936)
Browse files Browse the repository at this point in the history
* feat: add form to collect subscription data

* feat: add form to collect subscription data

* WIP: add ember-phone-input

* feat: add not loggedin and subscribed screen and integreate API

* feat: fixing bug

* fix: bug to show form even if user is already subscribed

* fix: urls

* fix: urls

* fix: urls

* delete: service subscribe test

* fix: resolve comments

* Update app/components/header.hbs

Co-authored-by: Mehul Kiran Chaudhari <55375534+MehulKChaudhari@users.noreply.github.com>

* fix: comments and remove modal

* fix: phone number input

* fix: content change

* fix: remove card

* fix: remove comments

* fix:subscribe message

---------

Co-authored-by: Vinit khandal <111434418+vinit717@users.noreply.github.com>
Co-authored-by: Mehul Kiran Chaudhari <55375534+MehulKChaudhari@users.noreply.github.com>
  • Loading branch information
3 people authored Oct 12, 2024
1 parent 1bb3076 commit 9fb0f2c
Show file tree
Hide file tree
Showing 14 changed files with 455 additions and 2 deletions.
5 changes: 4 additions & 1 deletion app/components/header.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,10 @@
class="nav__element"
href={{this.STATUS_URL}}
>Status</a></li>
{{#if @dev}}
{{#if @dev}}
<li>
<LinkTo @route="subscribe" class="nav__element">Subscribe</LinkTo>
</li>
<li>
{{! TODO - remove query for dev when it goes to production }}
<LinkTo
Expand Down
1 change: 1 addition & 0 deletions app/constants/urls.js
Original file line number Diff line number Diff line change
Expand Up @@ -99,3 +99,4 @@ export const SOCIALS = {
};

export const ANKUSH_TWITTER = 'https://twitter.com/ankushdharkar';
export const RDS_TWITTER = 'https://x.com/realdevsquad';
99 changes: 99 additions & 0 deletions app/controllers/subscribe.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,99 @@
import Controller from '@ember/controller';
import { tracked } from '@glimmer/tracking';
import { action } from '@ember/object';
import { inject as service } from '@ember/service';
import { RDS_TWITTER, APPS } from '../constants/urls';
import { TOAST_OPTIONS } from '../constants/toast-options';

export default class SubscribeController extends Controller {
@service login;
@tracked isFormOpen = false;
@tracked email = '';
@tracked phone = '';
@tracked userData = null;
@tracked isLoading = false;
@tracked showSubscribedMessage = false;
RDS_TWITTER = RDS_TWITTER;
constructor() {
super(...arguments);
this.userData = this.login.userData;
}
get isLoggedIn() {
return this.login.isLoggedIn;
}
get isSubscribed() {
return this.login.userData.isSubscribed;
}
get isSubmitDisabled() {
return !this.email || (this.phone && !/^\+?\d*$/.test(this.phone));
}
@action
toggleFormModal() {
this.isFormOpen = !this.isFormOpen;
}
@action
updateEmail(event) {
this.email = event.target.value;
}
@action
updatePhone(event) {
const input = event.target.value;
const isValidPhone = /^\+?\d*$/.test(input);
if (isValidPhone) {
this.phone = input;
}
}
@action
async handleSubmit(event) {
event.preventDefault();
if (!this.isSubmitDisabled) {
this.isLoading = true;
try {
const url = `${APPS.API_BACKEND}/subscription?dev=true`;
const response = await fetch(url, {
method: 'POST',
body: JSON.stringify({
email: this.email,
phoneNumber: this.phone,
}),
headers: {
'Content-Type': 'application/json',
},
credentials: 'include',
});
if (!response.ok) {
this.toast.error(
'Something went wrong. Please try again.',
'',
TOAST_OPTIONS,
);
} else {
this.login.userData.isSubscribed = true;
this.isFormOpen = false;
this.showSubscribedMessage = true;
this.toast.info('🎉 You are already subscribed!', '', TOAST_OPTIONS);
}
} catch (error) {
console.log(error);
this.toast.error(
`Something went wrong. ${error.message}`,
'',
TOAST_OPTIONS,
);
} finally {
this.isLoading = false;
}
this.email = '';
this.phone = '';
}
}
}
3 changes: 3 additions & 0 deletions app/models/user.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,7 @@ export default class UserModel extends Model {
@attr profileURL;
@attr profileStatus;
@attr website;
@attr isSubscribed;
@attr phoneNumber;
@attr email;
}
1 change: 1 addition & 0 deletions app/router.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,5 @@ Router.map(function () {
this.route('goto');
this.route('events');
this.route('debug');
this.route('subscribe');
});
3 changes: 3 additions & 0 deletions app/routes/subscribe.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
import Route from '@ember/routing/route';

export default class SubscribeRoute extends Route {}
2 changes: 2 additions & 0 deletions app/styles/app.css
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@
@import url("tooltip.module.css");
@import url("debug.module.css");
@import url("unauthenticated.module.css");
@import url("subscribe.module.css");
@import url("phone-input.module.css");

* {
margin: 0;
Expand Down
6 changes: 5 additions & 1 deletion app/styles/base-modal.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,11 @@
}

.base-modal--show {
display: block;
display: flex;
align-items: center;
justify-content: center;
background-color: #000000b2;
backdrop-filter: blur(5px);
}

.base-modal--hide {
Expand Down
23 changes: 23 additions & 0 deletions app/styles/phone-input.module.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
.phone-input {
display: flex;
align-items: center;
margin-bottom: 10px;
}

.country-code-select {
margin-right: 10px;
}

.phone-number-input {
flex-grow: 1;
}

.phone-input select,
.phone-input input[type="tel"] {
width: 100%;
padding: 5px;
}

button {
padding: 5px 10px;
}
Loading

0 comments on commit 9fb0f2c

Please sign in to comment.