Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

added signup/login messages and website settings #47

Merged
merged 12 commits into from
Nov 29, 2015
Merged

Conversation

Panioglo
Copy link
Member

No description provided.

@@ -20,6 +20,7 @@ form_signup.submit((e)->
dataType: 'json'
data: { website_member: { token: gon.token, email: form_signup.find('#email').val() } }
success: (data) ->
alert 'Confirm email first'
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nu imi place ca folosesti alerturi. Nu asta e idea. Incearca sa faci un div in care sa pui clasele de bootstrap si sa adaugi cu jquery mesajele astea in pagina nu cu alerturi...

@@ -14,7 +14,7 @@ form_login.submit((e)->
).fail ((resp) ->
console.log "we failed"
console.log resp
alert 'Email or password is invalid'
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

la fel si aici fara aleturi. Si mai putine console logs

@Chocksy Chocksy changed the title added signup/login messages added signup/login messages and website settings Oct 26, 2015
$.ajax
url: Routes.api_v1_members_url()
type: 'post'
dataType: 'json'
data: { website_member: { token: gon.token, email: form_signup.find('#email').val() } }
success: (data) ->
window.location.href = '/websites'
swal("Confirm email first!", "Wellcome", "success")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wellcome -> Welcome

@Chocksy
Copy link
Member

Chocksy commented Nov 29, 2015

asta e gata sergiu?

@Panioglo
Copy link
Member Author

Da, poate o sa mai adaugam ceva pe parcurs, dar deocamdata nu mai avem nici un issue pentru asta.

@Chocksy Chocksy merged commit bfa855d into master Nov 29, 2015
@Chocksy Chocksy deleted the website_settings branch November 29, 2015 16:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants