Add a registration form.
This commit is contained in:
parent
6d7fcb057d
commit
a766e886f5
7 changed files with 169 additions and 16 deletions
|
@ -20,6 +20,9 @@
|
||||||
<div v-if="authError" class='form-group'>
|
<div v-if="authError" class='form-group'>
|
||||||
<div class='error base05'>{{authError}}</div>
|
<div class='error base05'>{{authError}}</div>
|
||||||
</div>
|
</div>
|
||||||
|
<div class='form-group'>
|
||||||
|
<router-link :to="{name: 'registration'}">Register new account</router-link>
|
||||||
|
</div>
|
||||||
</form>
|
</form>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -63,6 +63,18 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
.btn {
|
||||||
|
cursor: pointer;
|
||||||
|
}
|
||||||
|
|
||||||
|
.btn[disabled] {
|
||||||
|
cursor: not-allowed;
|
||||||
|
}
|
||||||
|
|
||||||
|
.icon-cancel {
|
||||||
|
cursor: pointer;
|
||||||
|
}
|
||||||
form {
|
form {
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
|
@ -85,18 +97,6 @@
|
||||||
padding: 5px;
|
padding: 5px;
|
||||||
resize: vertical;
|
resize: vertical;
|
||||||
}
|
}
|
||||||
|
|
||||||
.btn {
|
|
||||||
cursor: pointer;
|
|
||||||
}
|
|
||||||
|
|
||||||
.btn[disabled] {
|
|
||||||
cursor: not-allowed;
|
|
||||||
}
|
|
||||||
|
|
||||||
.icon-cancel {
|
|
||||||
cursor: pointer;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
</style>
|
</style>
|
||||||
|
|
29
src/components/registration/registration.js
Normal file
29
src/components/registration/registration.js
Normal file
|
@ -0,0 +1,29 @@
|
||||||
|
const registration = {
|
||||||
|
data: () => ({
|
||||||
|
user: {},
|
||||||
|
error: false,
|
||||||
|
registering: false
|
||||||
|
}),
|
||||||
|
methods: {
|
||||||
|
submit () {
|
||||||
|
this.registering = true
|
||||||
|
this.user.nickname = this.user.username
|
||||||
|
this.$store.state.api.backendInteractor.register(this.user).then(
|
||||||
|
(response) => {
|
||||||
|
if (response.ok) {
|
||||||
|
this.$store.dispatch('loginUser', this.user)
|
||||||
|
this.$router.push('/main/all')
|
||||||
|
this.registering = false
|
||||||
|
} else {
|
||||||
|
this.registering = false
|
||||||
|
response.json().then((data) => {
|
||||||
|
this.error = data.error
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export default registration
|
86
src/components/registration/registration.vue
Normal file
86
src/components/registration/registration.vue
Normal file
|
@ -0,0 +1,86 @@
|
||||||
|
<template>
|
||||||
|
<div class="settings panel panel-default base00-background">
|
||||||
|
<div class="panel-heading base01-background base04">
|
||||||
|
Registration
|
||||||
|
</div>
|
||||||
|
<div class="panel-body">
|
||||||
|
<form v-on:submit.prevent='submit(user)' class='registration-form'>
|
||||||
|
<div class='form-group'>
|
||||||
|
<label for='username'>Username</label>
|
||||||
|
<input :disabled="registering" v-model='user.username' class='form-control' id='username' placeholder='e.g. lain'>
|
||||||
|
</div>
|
||||||
|
<div class='form-group'>
|
||||||
|
<label for='fullname'>Fullname</label>
|
||||||
|
<input :disabled="registering" v-model='user.fullname' class='form-control' id='fullname' placeholder='e.g. Lain Iwakura'>
|
||||||
|
</div>
|
||||||
|
<div class='form-group'>
|
||||||
|
<label for='bio'>Bio</label>
|
||||||
|
<input :disabled="registering" v-model='user.bio' class='form-control' id='bio'>
|
||||||
|
</div>
|
||||||
|
<div class='form-group'>
|
||||||
|
<label for='password'>Password</label>
|
||||||
|
<input :disabled="registering" v-model='user.password' class='form-control' id='password' type='password'>
|
||||||
|
</div>
|
||||||
|
<div class='form-group'>
|
||||||
|
<label for='password_confirmation'>Password confirmation</label>
|
||||||
|
<input :disabled="registering" v-model='user.confirm' class='form-control' id='password_confirmation' type='password'>
|
||||||
|
</div>
|
||||||
|
<div class='form-group'>
|
||||||
|
<button :disabled="registering" type='submit' class='btn btn-default base05 base01-background'>Submit</button>
|
||||||
|
</div>
|
||||||
|
<div v-if="error" class='form-group'>
|
||||||
|
<div class='error base05'>{{error}}</div>
|
||||||
|
</div>
|
||||||
|
</form>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script src="./registration.js"></script>
|
||||||
|
<style lang="scss">
|
||||||
|
|
||||||
|
.registration-form {
|
||||||
|
form {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
padding: 0.6em;
|
||||||
|
}
|
||||||
|
|
||||||
|
.form-group {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
padding: 0.3em 0.5em 0.6em;
|
||||||
|
line-height:24px;
|
||||||
|
}
|
||||||
|
|
||||||
|
form textarea {
|
||||||
|
border: solid;
|
||||||
|
border-width: 1px;
|
||||||
|
border-color: silver;
|
||||||
|
border-radius: 5px;
|
||||||
|
line-height:16px;
|
||||||
|
padding: 5px;
|
||||||
|
resize: vertical;
|
||||||
|
}
|
||||||
|
input {
|
||||||
|
border-width: 1px;
|
||||||
|
border-style: solid;
|
||||||
|
border-color: silver;
|
||||||
|
border-radius: 5px;
|
||||||
|
padding: 0.1em 0.2em 0.2em 0.2em;
|
||||||
|
}
|
||||||
|
|
||||||
|
.btn {
|
||||||
|
margin-top: 1.0em;
|
||||||
|
min-height: 28px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.error {
|
||||||
|
border-radius: 5px;
|
||||||
|
text-align: center;
|
||||||
|
background-color: rgba(255, 48, 16, 0.65);
|
||||||
|
min-height: 28px;
|
||||||
|
line-height: 28px;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</style>
|
|
@ -9,6 +9,7 @@ import ConversationPage from './components/conversation-page/conversation-page.v
|
||||||
import Mentions from './components/mentions/mentions.vue'
|
import Mentions from './components/mentions/mentions.vue'
|
||||||
import UserProfile from './components/user_profile/user_profile.vue'
|
import UserProfile from './components/user_profile/user_profile.vue'
|
||||||
import Settings from './components/settings/settings.vue'
|
import Settings from './components/settings/settings.vue'
|
||||||
|
import Registration from './components/registration/registration.vue'
|
||||||
|
|
||||||
import statusesModule from './modules/statuses.js'
|
import statusesModule from './modules/statuses.js'
|
||||||
import usersModule from './modules/users.js'
|
import usersModule from './modules/users.js'
|
||||||
|
@ -58,7 +59,8 @@ const routes = [
|
||||||
{ name: 'conversation', path: '/notice/:id', component: ConversationPage, meta: { dontScroll: true } },
|
{ name: 'conversation', path: '/notice/:id', component: ConversationPage, meta: { dontScroll: true } },
|
||||||
{ name: 'user-profile', path: '/users/:id', component: UserProfile },
|
{ name: 'user-profile', path: '/users/:id', component: UserProfile },
|
||||||
{ name: 'mentions', path: '/:username/mentions', component: Mentions },
|
{ name: 'mentions', path: '/:username/mentions', component: Mentions },
|
||||||
{ name: 'settings', path: '/settings', component: Settings }
|
{ name: 'settings', path: '/settings', component: Settings },
|
||||||
|
{ name: 'registration', path: '/registration', component: Registration }
|
||||||
]
|
]
|
||||||
|
|
||||||
const router = new VueRouter({
|
const router = new VueRouter({
|
||||||
|
|
|
@ -10,15 +10,18 @@ const RETWEET_URL = '/api/statuses/retweet'
|
||||||
const STATUS_UPDATE_URL = '/api/statuses/update.json'
|
const STATUS_UPDATE_URL = '/api/statuses/update.json'
|
||||||
const STATUS_DELETE_URL = '/api/statuses/destroy'
|
const STATUS_DELETE_URL = '/api/statuses/destroy'
|
||||||
const STATUS_URL = '/api/statuses/show'
|
const STATUS_URL = '/api/statuses/show'
|
||||||
const MEDIA_UPLOAD_URL = '/api/statusnet/media/upload'
|
const MEDIA_UPLOAD_URL = '/api/media/upload.json'
|
||||||
const CONVERSATION_URL = '/api/statusnet/conversation'
|
const CONVERSATION_URL = '/api/statusnet/conversation'
|
||||||
const MENTIONS_URL = '/api/statuses/mentions.json'
|
const MENTIONS_URL = '/api/statuses/mentions.json'
|
||||||
const FRIENDS_URL = '/api/statuses/friends.json'
|
const FRIENDS_URL = '/api/statuses/friends.json'
|
||||||
const FOLLOWING_URL = '/api/friendships/create.json'
|
const FOLLOWING_URL = '/api/friendships/create.json'
|
||||||
const UNFOLLOWING_URL = '/api/friendships/destroy.json'
|
const UNFOLLOWING_URL = '/api/friendships/destroy.json'
|
||||||
const QVITTER_USER_PREF_URL = '/api/qvitter/set_profile_pref.json'
|
const QVITTER_USER_PREF_URL = '/api/qvitter/set_profile_pref.json'
|
||||||
|
const REGISTRATION_URL = '/api/account/register.json'
|
||||||
// const USER_URL = '/api/users/show.json'
|
// const USER_URL = '/api/users/show.json'
|
||||||
|
|
||||||
|
import { each } from 'lodash'
|
||||||
|
|
||||||
const oldfetch = window.fetch
|
const oldfetch = window.fetch
|
||||||
|
|
||||||
let fetch = (url, options) => {
|
let fetch = (url, options) => {
|
||||||
|
@ -27,6 +30,32 @@ let fetch = (url, options) => {
|
||||||
return oldfetch(fullUrl, options)
|
return oldfetch(fullUrl, options)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Params needed:
|
||||||
|
// nickname
|
||||||
|
// email
|
||||||
|
// fullname
|
||||||
|
// password
|
||||||
|
// password_confirm
|
||||||
|
//
|
||||||
|
// Optional
|
||||||
|
// bio
|
||||||
|
// homepage
|
||||||
|
// location
|
||||||
|
const register = (params) => {
|
||||||
|
const form = new FormData()
|
||||||
|
|
||||||
|
each(params, (value, key) => {
|
||||||
|
if (value) {
|
||||||
|
form.append(key, value)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
return fetch(REGISTRATION_URL, {
|
||||||
|
method: 'POST',
|
||||||
|
body: form
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
const authHeaders = (user) => {
|
const authHeaders = (user) => {
|
||||||
if (user && user.username && user.password) {
|
if (user && user.username && user.password) {
|
||||||
return { 'Authorization': `Basic ${btoa(`${user.username}:${user.password}`)}` }
|
return { 'Authorization': `Basic ${btoa(`${user.username}:${user.password}`)}` }
|
||||||
|
@ -198,7 +227,8 @@ const apiService = {
|
||||||
uploadMedia,
|
uploadMedia,
|
||||||
fetchAllFollowing,
|
fetchAllFollowing,
|
||||||
setUserMute,
|
setUserMute,
|
||||||
fetchMutes
|
fetchMutes,
|
||||||
|
register
|
||||||
}
|
}
|
||||||
|
|
||||||
export default apiService
|
export default apiService
|
||||||
|
|
|
@ -36,6 +36,8 @@ const backendInteractorService = (credentials) => {
|
||||||
|
|
||||||
const fetchMutes = () => apiService.fetchMutes({credentials})
|
const fetchMutes = () => apiService.fetchMutes({credentials})
|
||||||
|
|
||||||
|
const register = (params) => apiService.register(params)
|
||||||
|
|
||||||
const backendInteractorServiceInstance = {
|
const backendInteractorServiceInstance = {
|
||||||
fetchStatus,
|
fetchStatus,
|
||||||
fetchConversation,
|
fetchConversation,
|
||||||
|
@ -46,7 +48,8 @@ const backendInteractorService = (credentials) => {
|
||||||
verifyCredentials: apiService.verifyCredentials,
|
verifyCredentials: apiService.verifyCredentials,
|
||||||
startFetching,
|
startFetching,
|
||||||
setUserMute,
|
setUserMute,
|
||||||
fetchMutes
|
fetchMutes,
|
||||||
|
register
|
||||||
}
|
}
|
||||||
|
|
||||||
return backendInteractorServiceInstance
|
return backendInteractorServiceInstance
|
||||||
|
|
Loading…
Reference in a new issue