feat(client, db): event url

client/graphql.schema.json

@@ -547,6 +547,18 @@
  "isDeprecated": false,
  "deprecationReason": null
  },
+ {
+ "name": "url",
+ "description": null,
+ "args": [],
+ "type": {
+ "kind": "SCALAR",
+ "name": "String",
+ "ofType": null
+ },
+ "isDeprecated": false,
+ "deprecationReason": null
+ },
  {
  "name": "start_at",
  "description": null,
@@ -2761,6 +2773,20 @@
  },
  "defaultValue": null
  },
+ {
+ "name": "url",
+ "description": null,
+ "type": {
+ "kind": "NON_NULL",
+ "name": null,
+ "ofType": {
+ "kind": "SCALAR",
+ "name": "String",
+ "ofType": null
+ }
+ },
+ "defaultValue": null
+ },
  {
  "name": "start_at",
  "description": null,
@@ -2862,6 +2888,16 @@
  },
  "defaultValue": null
  },
+ {
+ "name": "url",
+ "description": null,
+ "type": {
+ "kind": "SCALAR",
+ "name": "String",
+ "ofType": null
+ },
+ "defaultValue": null
+ },
  {
  "name": "start_at",
  "description": null,

client/src/generated/index.tsx

@@ -63,6 +63,7 @@ export type Event = {
  updated_at: Scalars['DateTime'];
  name: Scalars['String'];
  description: Scalars['String'];
+ url?: Maybe<Scalars['String']>;
  start_at: Scalars['DateTime'];
  ends_at: Scalars['DateTime'];
  canceled: Scalars['Boolean'];
@@ -280,6 +281,7 @@ export type UpdateVenueInputs = {
 export type CreateEventInputs = {
  name: Scalars['String'];
  description: Scalars['String'];
+ url: Scalars['String'];
  start_at: Scalars['DateTime'];
  ends_at: Scalars['DateTime'];
  capacity: Scalars['Float'];
@@ -290,6 +292,7 @@ export type CreateEventInputs = {
 export type UpdateEventInputs = {
  name?: Maybe<Scalars['String']>;
  description?: Maybe<Scalars['String']>;
+ url?: Maybe<Scalars['String']>;
  start_at?: Maybe<Scalars['DateTime']>;
  ends_at?: Maybe<Scalars['DateTime']>;
  capacity?: Maybe<Scalars['Float']>;
@@ -302,7 +305,7 @@ export type EventsQuery = { __typename?: 'Query' } & {
  events: Array<
  { __typename?: 'Event' } & Pick<
  Event,
- 'id' | 'name' | 'canceled' | 'description' | 'capacity'
+ 'id' | 'name' | 'canceled' | 'description' | 'url' | 'capacity'
  > & {
  tags?: Maybe<Array<{ __typename?: 'Tag' } & Pick<Tag, 'id' | 'name'>>>;
  }
@@ -320,6 +323,7 @@ export type EventQuery = { __typename?: 'Query' } & {
  | 'id'
  | 'name'
  | 'description'
+ | 'url'
  | 'canceled'
  | 'capacity'
  | 'start_at'
@@ -356,7 +360,13 @@ export type EventVenuesQuery = { __typename?: 'Query' } & {
  event?: Maybe<
  { __typename?: 'Event' } & Pick<
  Event,
- 'id' | 'name' | 'description' | 'capacity' | 'start_at' | 'ends_at'
+ | 'id'
+ | 'name'
+ | 'description'
+ | 'url'
+ | 'capacity'
+ | 'start_at'
+ | 'ends_at'
  > & {
  tags?: Maybe<Array<{ __typename?: 'Tag' } & Pick<Tag, 'id' | 'name'>>>;
  venue: { __typename?: 'Venue' } & Pick<Venue, 'id'>;
@@ -372,7 +382,7 @@ export type CreateEventMutationVariables = Exact<{
 export type CreateEventMutation = { __typename?: 'Mutation' } & {
  createEvent: { __typename?: 'Event' } & Pick<
  Event,
- 'id' | 'name' | 'canceled' | 'description' | 'capacity'
+ 'id' | 'name' | 'canceled' | 'description' | 'url' | 'capacity'
  > & {
  tags?: Maybe<Array<{ __typename?: 'Tag' } & Pick<Tag, 'id' | 'name'>>>;
  };
@@ -489,6 +499,7 @@ export const EventsDocument = gql`
  name
  canceled
  description
+ url
  capacity
  tags {
  id
@@ -547,6 +558,7 @@ export const EventDocument = gql`
  id
  name
  description
+ url
  canceled
  capacity
  start_at
@@ -627,6 +639,7 @@ export const EventVenuesDocument = gql`
  id
  name
  description
+ url
  capacity
  start_at
  ends_at
@@ -698,6 +711,7 @@ export const CreateEventDocument = gql`
  name
  canceled
  description
+ url
  capacity
  tags {
  id

client/src/modules/dashboard/Events/components/EventFormUtils.ts

@@ -21,6 +21,12 @@ export const fields: IField[] = [
  label: 'Description',
  placeholder: '',
  },
+ {
+ key: 'url',
+ type: 'text',
+ label: 'url',
+ placeholder: '',
+ },
  {
  key: 'capacity',
  type: 'number',
@@ -52,6 +58,7 @@ export const fields: IField[] = [
 export interface IEventFormData {
  name: string;
  description: string;
+ url?: string | null;
  capacity: number;
  tags: string;
  start_at: string;

client/src/modules/dashboard/Events/components/EventItem.tsx

@@ -10,7 +10,7 @@ import Actions from './Actions';
 interface IEventItemProps {
  event: Pick<
  Event,
- 'id' | 'name' | 'description' | 'capacity' | 'canceled'
+ 'id' | 'name' | 'description' | 'url' | 'capacity' | 'canceled'
  > & { tags?: Pick<Tag, 'id' | 'name'>[] | null };
  loading: boolean;
 }
@@ -37,6 +37,7 @@ const EventItem: React.FC<IEventItemProps> = ({ loading, event }) => {
  <Typography variant="body2" color="textSecondary" component="p">
  {event.description}
  </Typography>
+ {event.url && <a href={event.url}>{event.url}</a>}
  <Typography variant="body2" color="textSecondary" component="p">
  {event.capacity}
  </Typography>

client/src/modules/dashboard/Events/graphql/queries.ts

@@ -7,6 +7,7 @@ export const EVENTS = gql`
  name
  canceled
  description
+ url
  capacity
  tags {
  id
@@ -22,6 +23,7 @@ export const EVENT = gql`
  id
  name
  description
+ url
  canceled
  capacity
  start_at
@@ -58,6 +60,7 @@ export const EVENT_WITH_VENU = gql`
  id
  name
  description
+ url
  capacity
  start_at
  ends_at
@@ -83,6 +86,7 @@ export const createEvent = gql`
  name
  canceled
  description
+ url
  capacity
  tags {
  id

client/src/modules/dashboard/Events/pages/EventPage.tsx

@@ -24,7 +24,7 @@ export const EventPage: NextPage = () => {
  {loading
  ? 'Loading...'
  : !error
- ? 'Cant find event :('
+ ? "Can't find event :("
  : 'Error...'}
  </h1>
  </Skeleton>
@@ -48,6 +48,7 @@ export const EventPage: NextPage = () => {
  <Typography variant="body2" color="textSecondary" component="p">
  {data.event.description}
  </Typography>
+ <a href={data.event.url}>{data.event.url}</a>
  <Typography variant="body2" color="textSecondary" component="p">
  {data.event.capacity}
  </Typography>

db/generator/factories/events.factory.ts

@@ -1,4 +1,4 @@
-import { company, lorem } from 'faker';
+import { company, lorem, internet } from 'faker';
 import {
  Event,
  Venue,
@@ -21,6 +21,7 @@ const createEvents = async (
  name: company.companyName(),
  chapter: randomItem(chapters),
  description: lorem.words(),
+ url: internet.url(),
  capacity: random(1000),
  venue: randomItem(venues),
  canceled: Math.random() > 0.5,

db/migrations/1603576293055-AddUrlColumnToEvent.ts

@@ -0,0 +1,13 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class AddUrlColumnToEvent1603576293055 implements MigrationInterface {
+ name = 'AddUrlColumnToEvent1603576293055';
+
+ public async up(queryRunner: QueryRunner): Promise<void> {
+ await queryRunner.query(`ALTER TABLE "events" ADD "url" character varying`);
+ }
+
+ public async down(queryRunner: QueryRunner): Promise<void> {
+ await queryRunner.query(`ALTER TABLE "events" DROP COLUMN "url"`);
+ }
+}

server/controllers/Events/inputs.ts

@@ -8,6 +8,9 @@ export class CreateEventInputs {
  @Field(() => String)
  description: string;
 
+ @Field(() => String, { nullable: true })
+ url?: string;
+
  @Field(() => Date)
  start_at: number;
 
@@ -32,6 +35,9 @@ export class UpdateEventInputs {
  @Field(() => String, { nullable: true })
  description: string;
 
+ @Field(() => String, { nullable: true })
+ url?: string;
+
  @Field(() => Date, { nullable: true })
  start_at: number;
 

server/controllers/Events/resolver.ts

@@ -47,6 +47,7 @@ export class EventResolver {
 
  event.name = data.name ?? event.name;
  event.description = data.description ?? event.description;
+ event.url = data.url ?? event.url;
  event.start_at = new Date(data.start_at) ?? event.start_at;
  event.ends_at = new Date(data.ends_at) ?? event.ends_at;
  event.capacity = data.capacity ?? event.capacity;
@@ -56,7 +57,6 @@ export class EventResolver {
  if (!venue) throw new Error('Cant find venue');
  event.venue = venue;
  }
-
  return event.save();
  }
 

server/models/Event.ts

@@ -18,6 +18,10 @@ export class Event extends BaseModel {
  @Column({ nullable: false })
  description!: string;
 
+ @Field(() => String, { nullable: true })
+ @Column({ nullable: true })
+ url?: string;
+
  @Field(() => Date)
  @Column({ type: 'timestamp' })
  start_at!: Date;
@@ -77,6 +81,7 @@ export class Event extends BaseModel {
  constructor(params: {
  name: string;
  description: string;
+ url?: string;
  start_at: Date;
  ends_at: Date;
  canceled?: boolean;
@@ -89,6 +94,7 @@ export class Event extends BaseModel {
  const {
  name,
  description,
+ url,
  start_at,
  ends_at,
  canceled,
@@ -99,6 +105,7 @@ export class Event extends BaseModel {
 
  this.name = name;
  this.description = description;
+ this.url = url;
  this.start_at = start_at;
  this.ends_at = ends_at;
  this.canceled = canceled || false;