Merge branch 'bug/routing' into 'master'

Fix routing between BE & FE and fix event creation

See merge request framasoft/mobilizon!86
This commit is contained in:
Thomas Citharel 2019-03-05 12:13:14 +01:00
commit c4a3381b45
5 changed files with 66 additions and 47 deletions

View File

@ -43,14 +43,13 @@
</template> </template>
<script lang="ts"> <script lang="ts">
import { Component, Prop, Vue, Watch } from "vue-property-decorator"; import { Component, Vue, Watch } from "vue-property-decorator";
import { AUTH_USER_ACTOR } from "@/constants";
import { SEARCH } from "@/graphql/search"; import { SEARCH } from "@/graphql/search";
import { CURRENT_USER_CLIENT } from "@/graphql/user"; import { CURRENT_USER_CLIENT } from "@/graphql/user";
import { onLogout } from "@/vue-apollo"; import { onLogout } from "@/vue-apollo";
import { deleteUserData } from "@/utils/auth"; import { deleteUserData } from "@/utils/auth";
import { LOGGED_PERSON } from "@/graphql/actor"; import { LOGGED_PERSON } from "@/graphql/actor";
import { IActor, IPerson } from '../types/actor.model'; import { IActor, IPerson } from '@/types/actor.model';
import { RouteName } from '@/router' import { RouteName } from '@/router'
@Component({ @Component({

View File

@ -1,5 +1,5 @@
export interface IActor { export interface IActor {
id: string; id?: string;
url: string; url: string;
name: string; name: string;
domain: string|null; domain: string|null;
@ -10,6 +10,17 @@ export interface IActor {
bannerUrl: string; bannerUrl: string;
} }
export class Actor implements IActor {
avatarUrl: string = '';
bannerUrl: string = '';
domain: string | null = null;
name: string = '';
preferredUsername: string = '';
summary: string = '';
suspended: boolean = false;
url: string = '';
}
export interface IPerson extends IActor { export interface IPerson extends IActor {
} }
@ -18,6 +29,8 @@ export interface IGroup extends IActor {
members: IMember[]; members: IMember[];
} }
export class Person extends Actor implements IPerson {}
export enum MemberRole { export enum MemberRole {
PENDING, PENDING,
MEMBER, MEMBER,

View File

@ -1,4 +1,4 @@
import { IActor } from './actor.model'; import {Actor, IActor} from './actor.model';
export enum EventStatus { export enum EventStatus {
TENTATIVE, TENTATIVE,
@ -70,3 +70,24 @@ export interface IEvent {
// online_address: Address; // online_address: Address;
// phone_address: string; // phone_address: string;
} }
export class EventModel implements IEvent {
begins_on: Date = new Date();
category: Category = Category.MEETING;
description: string = '';
ends_on: Date = new Date();
join_options: EventJoinOptions = EventJoinOptions.FREE;
large_image: string = '';
local: boolean = true;
participants: IParticipant[] = [];
publish_at: Date = new Date();
status: EventStatus = EventStatus.CONFIRMED;
thumbnail: string = '';
title: string = '';
url: string = '';
uuid: string = '';
visibility: EventVisibility = EventVisibility.PUBLIC;
attributedTo: IActor = new Actor();
organizerActor: IActor = new Actor();
}

View File

@ -1,5 +1,3 @@
import {Category} from "../../types/event.model";
import {EventJoinOptions} from "../../types/event.model";
<template> <template>
<section> <section>
<h1 class="title"> <h1 class="title">
@ -36,55 +34,34 @@ import {EventJoinOptions} from "../../types/event.model";
// import Location from '@/components/Location'; // import Location from '@/components/Location';
import {CREATE_EVENT, EDIT_EVENT} from "@/graphql/event"; import {CREATE_EVENT, EDIT_EVENT} from "@/graphql/event";
import {Component, Prop, Vue} from "vue-property-decorator"; import {Component, Prop, Vue} from "vue-property-decorator";
import {Category, EventJoinOptions, EventStatus, EventVisibility, IEvent} from "@/types/event.model"; import {
Category,
IEvent,
EventModel,
} from "@/types/event.model";
import {LOGGED_PERSON} from "@/graphql/actor"; import {LOGGED_PERSON} from "@/graphql/actor";
import {IPerson} from "@/types/actor.model"; import {IPerson, Person} from "@/types/actor.model";
@Component({}) @Component({
apollo: {
loggedPerson: {
query: LOGGED_PERSON,
}
}
})
export default class CreateEvent extends Vue { export default class CreateEvent extends Vue {
@Prop({ required: false, type: String }) uuid!: string; @Prop({ required: false, type: String }) uuid!: string;
loggedPerson!: IPerson; loggedPerson: IPerson = new Person();
categories: string[] = Object.keys(Category); categories: string[] = Object.keys(Category);
event!: IEvent; // FIXME: correctly type an event event: IEvent = new EventModel();
// created() {
// if (this.uuid) {
// this.fetchEvent();
// }
// }
async created() {
// We put initialization here because we need loggedPerson to be ready before initializing event
const { data } = await this.$apollo.query({ query: LOGGED_PERSON });
this.loggedPerson = data.loggedPerson;
this.event = {
title: "",
organizerActor: this.loggedPerson,
attributedTo: this.loggedPerson,
description: "",
begins_on: new Date(),
ends_on: new Date(),
category: Category.MEETING,
participants: [],
uuid: "",
url: "",
local: true,
status: EventStatus.CONFIRMED,
visibility: EventVisibility.PUBLIC,
join_options: EventJoinOptions.FREE,
thumbnail: "",
large_image: "",
publish_at: new Date()
};
}
createEvent(e: Event) { createEvent(e: Event) {
e.preventDefault(); e.preventDefault();
this.event.organizerActor = this.loggedPerson;
this.event.attributedTo = this.loggedPerson;
if (this.uuid === undefined) { if (this.event.uuid === "") {
this.$apollo this.$apollo
.mutate({ .mutate({
mutation: CREATE_EVENT, mutation: CREATE_EVENT,
@ -104,7 +81,7 @@ export default class CreateEvent extends Vue {
}); });
}) })
.catch(error => { .catch(error => {
console.log(error); console.error(error);
}); });
} else { } else {
this.$apollo this.$apollo

View File

@ -65,6 +65,15 @@ defmodule MobilizonWeb.Router do
get("/@:name/feed/:format", FeedController, :actor) get("/@:name/feed/:format", FeedController, :actor)
end end
scope "/", MobilizonWeb do
pipe_through(:browser)
# Because the "/events/:uuid" route caches all these, we need to force them
get("/events/create", PageController, :index)
get("/events/list", PageController, :index)
get("/events/:uuid/edit", PageController, :index)
end
scope "/", MobilizonWeb do scope "/", MobilizonWeb do
pipe_through(:activity_pub_and_html) pipe_through(:activity_pub_and_html)
get("/@:name", PageController, :actor) get("/@:name", PageController, :actor)