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

Bugfix/add actions to the buttons #33

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion components/Events/Create/NewOrganizationForm.vue
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
:error-messages="errors.collect('phone')"
v-validate="'required'"
data-vv-name="phone"
type="number"
required
></v-text-field>
<v-text-field
Expand Down Expand Up @@ -81,7 +82,7 @@ export default {
pic: '',
name: '',
email: '',
phone: '',
phone: 0,
website: '',
instagramLink: '',
twitterLink: '',
Expand Down
17 changes: 9 additions & 8 deletions components/Events/EventList.vue
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
<template>
<div>
<event-preview v-for="event in events"
:key="event.id"
<event-preview v-for="event in events"
:key="event.id"
:id="event.id"
:slug="event.slug"
:title="event.title"
:organization="event.organization"
:description="event.description" />
</div>
:slug="event.slug"
:title="event.title"
:organization="event.organization"
:description="event.description"
:registrationLink="event.registrationLink"/>
</div>
</template>

<script>
Expand All @@ -21,7 +22,7 @@ export default {
props: {
events: {
type: Array,
required: true,
required: false,
Copy link
Member

Choose a reason for hiding this comment

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

karena component EventList ini butuh list of event berupa Array, sebaiknya tetap di buat required ya

}
}
}
Expand Down
12 changes: 9 additions & 3 deletions components/Events/EventPreview.vue
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,13 @@
<v-card-title primary-title>
<div>
<h3 class="headline mb-0">{{ title }}</h3>
<div> {{ description }} </div>
<div> {{ description }} </div>

</div>
</v-card-title>
<v-card-actions>
<v-btn flat color="secondary" @click="$router.push('/events/' + slug)">Daftar</v-btn>
<!--<a v-if="registrationLink != ''" class="btn btn&#45;&#45;flat secondary&#45;&#45;text" :href="registrationLink" target="_blank">Daftar</a>-->
Copy link
Member

Choose a reason for hiding this comment

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

komentar ini sebaiknya di hapus saja

<v-btn v-show="registrationLink != '' " flat color="secondary" v-bind:href="registrationLink">Daftar</v-btn>
<v-btn flat color="orange">Bagikan</v-btn>
</v-card-actions>
</v-card>
Expand Down Expand Up @@ -39,7 +41,11 @@ export default {
type: String,
required: true,
},
registrationLink :{
type: String,
required: true,
}
}

}
</script>
10 changes: 5 additions & 5 deletions pages/login.vue
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<template>
<v-layout align-center justify-center>
<v-flex xs12
sm4
md4
text-xs-center
<v-flex xs12
sm4
md4
text-xs-center
mt-5>
<h3>Masuk kedalam sistem MozSpaceJKT</h3>
<form>
Expand Down Expand Up @@ -60,7 +60,7 @@ export default {
password: this.password,
}
}).then(() => {
this.$toast.error('Error while authenticating')
this.$toast.success('Success authenticating')
}).catch((e) => {
this.$toast.error('Error while authenticating')
})
Expand Down