Chore/update types

client/hooks/useAuth.tsx

@@ -1,10 +1,7 @@
 import { useEthers } from '@usedapp/core';
 import React from 'react';
+import { User } from '../types';
 
-type User = {
-  id: string;
-  nonce: string;
-};
 type UserPayload = { user: User | null; setUser: React.Dispatch<User | null> };
 
 const AuthContext = React.createContext<UserPayload | null>(null);

client/types/common.ts

@@ -1,14 +1,15 @@
 export type Table =
   | 'users'
-  | 'user_category'
+  | 'user_keyword'
+  | 'organizations'
   | 'jobs'
-  | 'job_category'
+  | 'job_keyword'
   | 'job_applications'
   | 'gigs'
-  | 'gig_category'
+  | 'gig_keyword'
   | 'gig_applications'
-  | 'categories'
-  | 'company_members'
+  | 'keywords'
+  | 'organization_members'
   | 'links';
 
 export type WithTimestamp = {
@@ -32,6 +33,7 @@ export type Application = {
 };
 
 /**
+ * @description
  * Status indicator for job/gig applications.
  *
  * Default status should always be "Draft"
@@ -49,6 +51,7 @@ export enum ApplicationStatus {
 }
 
 /**
+ * @description
  * Status for job/gig postings.
  *
  * Default status should always be "Draft"

client/types/gig.ts

@@ -25,9 +25,10 @@ export type GigForm = Pick<
   | 'featured_photo_url'
   | 'experience_level'
   | 'status'
+  | 'created_by'
 >;
 
-export type GigCategory = {
+export type GigKeyword = {
   gig_id: string;
   category_id: string;
 } & WithTimestamp;
@@ -40,5 +41,5 @@ export type GigApplication = PrimaryKey & {
 
 export type GigApplicationForm = Pick<
   GigApplication,
-  'gig_id' | 'pitch' | 'content' | 'status'
+  'gig_id' | 'pitch' | 'content' | 'status' | 'created_by'
 >;

client/types/index.ts

@@ -1,6 +1,7 @@
 export * from './common';
-export * from './company';
+export * from './organization';
 export * from './gig';
 export * from './job';
 export * from './link';
+export * from './keyword';
 export * from './user';

client/types/job.ts

@@ -26,9 +26,10 @@ export type JobForm = Pick<
   | 'opportunity'
   | 'featured_photo_url'
   | 'status'
+  | 'created_by'
 >;
 
-export type JobCategory = {
+export type JobKeyword = {
   job_id: string;
   category_id: string;
 } & WithTimestamp;
@@ -41,5 +42,5 @@ export type JobApplication = PrimaryKey & {
 
 export type JobApplicationForm = Pick<
   JobApplication,
-  'job_id' | 'pitch' | 'content' | 'status'
+  'job_id' | 'pitch' | 'content' | 'status' | 'created_by'
 >;

client/types/keyword.ts

@@ -0,0 +1,7 @@
+import { PrimaryKey, WithTimestamp } from '.';
+
+export type Keyword = PrimaryKey & {
+  name: string;
+} & WithTimestamp;
+
+export type KeywordForm = Pick<Keyword, 'name'>;

client/types/link.ts

@@ -48,4 +48,5 @@ export type LinkForm = Pick<
   | 'type'
   | 'url'
   | 'featured_photo_url'
+  | 'created_by'
 >;

client/types/company.ts → client/types/organization.ts

@@ -1,6 +1,6 @@
 import { CreatedBy, PrimaryKey, WithTimestamp } from './common';
 
-export type Company = PrimaryKey & {
+export type Organization = PrimaryKey & {
   name: string;
   email: string;
   description: string;
@@ -9,12 +9,17 @@ export type Company = PrimaryKey & {
 } & WithTimestamp &
   CreatedBy;
 
-export type CompanyMember = {
+export type OrganizationMember = {
   company_id: string;
   user_id: string;
 } & WithTimestamp;
 
-export type CompanyForm = Pick<
-  Company,
-  'cover_photo_url' | 'description' | 'email' | 'logo_url' | 'name'
+export type OrganizationForm = Pick<
+  Organization,
+  | 'cover_photo_url'
+  | 'description'
+  | 'email'
+  | 'logo_url'
+  | 'name'
+  | 'created_by'
 >;

client/types/user.ts

@@ -3,24 +3,19 @@ import { PrimaryKey, WithTimestamp } from './common';
 export type User = PrimaryKey & {
   avatar_url?: string;
   cover_photo_url?: string;
+  nonce?: string;
   email: string;
   username?: string;
   preferences?: string;
-  wallet_address?: string;
   disabled_at?: Date;
 } & WithTimestamp;
 
-export type UserCategory = {
+export type UserKeyword = {
   user_id: string;
   category_id: string;
 } & WithTimestamp;
 
 export type UserForm = Pick<
   User,
-  | 'avatar_url'
-  | 'cover_photo_url'
-  | 'email'
-  | 'username'
-  | 'preferences'
-  | 'wallet_address'
+  'avatar_url' | 'cover_photo_url' | 'email' | 'username' | 'preferences'
 >;