Merge pull request #22 from tomvin/dev

Sprint 3.

package.json

@@ -3,6 +3,7 @@
   "version": "0.1.0",
   "private": true,
   "dependencies": {
+    "@apollo/react-hoc": "^3.1.1",
     "@apollo/react-hooks": "^3.0.1",
     "@fortawesome/fontawesome-svg-core": "^1.2.22",
     "@fortawesome/free-regular-svg-icons": "^5.10.2",
@@ -14,6 +15,7 @@
     "@types/react": "16.9.2",
     "@types/react-dom": "16.8.5",
     "@types/react-redux": "^7.1.2",
+    "@types/react-select": "^3.0.4",
     "@types/redux-logger": "^3.0.7",
     "@typescript-eslint/eslint-plugin": "^1.13.0",
     "apollo-boost": "^0.4.4",
@@ -25,6 +27,10 @@
     "react-redux": "^7.1.1",
     "react-router-dom": "^5.0.1",
     "react-scripts": "3.1.1",
+    "react-select": "^3.0.5",
+    "react-select-fast-filter-options": "^0.2.3",
+    "react-virtualized": "^9.21.1",
+    "react-virtualized-select": "^3.1.3",
     "redux-logger": "^3.0.6",
     "redux-starter-kit": "^0.6.3",
     "typescript": "3.5.3"

src/api/fragments/jobDetailsFragment.ts

@@ -0,0 +1,26 @@
+import { gql } from 'apollo-boost';
+
+export const JOB_DETAILS_FRAGMENT = gql`
+  fragment JobDetails on Job {
+    _id
+    name
+    description
+    location
+    salary
+    company{
+      _id
+      name
+      logoUrl
+    }
+    education{
+      _id
+      field
+      level
+    }
+    competence{
+      _id
+      level
+      skill
+    }
+  }
+`;

src/api/fragments/userForJobMatchFragment.ts

@@ -0,0 +1,21 @@
+import { gql } from 'apollo-boost';
+
+export type UserForJobMatchFragment = {
+  _id: string;
+  email: string;
+  jobSeeker: {
+    _id: string;
+    name: string;
+  }
+}
+
+export const USER_FOR_JOB_MATCH_FRAGMENT = gql`
+  fragment UserForJobMatch on User {
+    _id
+    email
+    jobSeeker {
+      _id
+      name
+    }
+  }
+`;

src/api/mutations/acceptJobMutation.ts

@@ -0,0 +1,18 @@
+import gql from "graphql-tag";
+
+export type AcceptJobVariables = {
+  acceptInput: {
+    userId: string;
+    jobId: string;
+  }
+}
+
+export type AcceptJobResult = {
+  acceptJob: 'Already 1 Way Match' | '1 Way Match' | string;
+}
+
+export const ACCEPT_JOB = gql`
+  mutation AcceptJob($acceptInput: AcceptInput!) {
+    acceptJob(acceptInput: $acceptInput)
+  }
+`;

src/api/mutations/acceptJobSeekerMutation.ts

@@ -0,0 +1,18 @@
+import gql from "graphql-tag";
+
+export type AcceptJobSeekerVariables = {
+  acceptInput: {
+    userId: string;
+    jobId: string;
+  }
+}
+
+export type AcceptJobSeekerResult = {
+  acceptJobSeeker: 'Already 1 Way Match' | '1 Way Match' | string;
+}
+
+export const ACCEPT_JOB_SEEKER = gql`
+  mutation AcceptJobSeeker($acceptInput: AcceptInput!) {
+    acceptJobSeeker(acceptInput: $acceptInput)
+  }
+`;

src/api/mutations/createCompanyMutation.ts

@@ -0,0 +1,27 @@
+import gql from "graphql-tag";
+
+export type CreateCompanyVariables = {
+  companyInput: {
+    name: string;
+    phone: string;
+    email: string;
+  }
+  userInput: {
+    email: string;
+    password: string;
+  }
+}
+
+export type CreateCompanyResult = {
+  createCompany: {
+    _id: string;
+  }
+}
+
+export const CREATE_COMPANY = gql`
+  mutation CreateCompany($companyInput: CompanyInput!, $userInput: UserInput) {
+    createCompany(companyInput: $companyInput, userInput: $userInput) {
+      _id
+    }
+  }
+`;

src/api/mutations/createJobSeekerMutation.ts

@@ -0,0 +1,36 @@
+import gql from "graphql-tag";
+
+export type CreateJobSeekerVariables = {
+  jobSeekerInput: {
+    name: string;
+    phone: string;
+    education: string[];
+    competence: string[];
+    location: string;
+    typeofwork: number;
+    salary: number;
+    education_p: number;
+    competence_p: number;
+    location_p: number;
+    typeofwork_p: number;
+    salary_p: number;
+  }
+  userInput: {
+    email: string;
+    password: string;
+  }
+}
+
+export type CreateJobSeekerResult = {
+  createJobSeeker: {
+    _id: string;
+  }
+}
+
+export const CREATE_JOB_SEEKER = gql`
+  mutation CreateJobSeeker($jobSeekerInput: JobSeekerInput!, $userInput: UserInput) {
+    createJobSeeker(jobSeekerInput: $jobSeekerInput, userInput: $userInput) {
+      _id
+    }
+  }
+`;

src/api/queries/allJobSeekerUsersQuery.ts

@@ -0,0 +1,33 @@
+import gql from "graphql-tag";
+import { IUser } from "../../models/User";
+
+export type AllJobSeekerUsersResult = {
+  users: IUser[] | undefined;
+}
+
+export const ALL_JOB_SEEKER_USERS_QUERY =  gql`
+query AllJobSeekerUsers {
+  users {
+    _id
+    email
+    jobSeeker {
+      _id
+      name
+      phone
+      location
+      typeofwork
+      salary
+      education {
+        _id
+        level
+        field
+      }
+      competence {
+        _id
+        level
+        skill
+      }
+    }
+  }
+}
+`;

src/api/queries/allJobsDetailsQuery.ts

@@ -0,0 +1,16 @@
+import gql from "graphql-tag";
+import { IJob } from "../../models/Job";
+import { JOB_DETAILS_FRAGMENT } from '../fragments/jobDetailsFragment';
+
+export type AllJobDetailsResult = {
+  allJobDetails: IJob[] | undefined;
+}
+
+export const ALL_JOB_DETAILS_QUERY =  gql`
+query AllJobDetails {
+  allJobDetails: jobs{
+    ...JobDetails
+  }
+}
+${JOB_DETAILS_FRAGMENT}
+`;

src/api/queries/jobCompleteMatchesQuery.ts

@@ -0,0 +1,23 @@
+import gql from "graphql-tag";
+import { USER_FOR_JOB_MATCH_FRAGMENT } from '../fragments/userForJobMatchFragment';
+import { IUser } from "../../models/User";
+
+export type JobCompleteMatchVariables = {
+  companyUserId: string;
+}
+
+export type JobCompleteMatchResult = {
+  jobCompleteMatches: { _id: string; completeJobSeekerMatch: IUser[] }[] | undefined;
+}
+
+export const JOB_COMPLETE_MATCH_QUERY =  gql`
+query JobCompleteMatches($companyUserId:String!) {
+  jobCompleteMatches(companyUserId:$companyUserId){
+    _id
+    completeJobSeekerMatch {
+      ...UserForJobMatch
+    }
+  }
+}
+${USER_FOR_JOB_MATCH_FRAGMENT}
+`;

src/api/queries/jobMatchQuery.ts

@@ -0,0 +1,23 @@
+import gql from "graphql-tag";
+import { USER_FOR_JOB_MATCH_FRAGMENT } from '../fragments/userForJobMatchFragment';
+import { IJobMatch } from "../../models/JobMatch";
+
+export type JobMatchVariables = {
+  jobId: string;
+}
+
+export type JobMatchResult = {
+  jobMatch: IJobMatch[] | undefined;
+}
+
+export const JOB_MATCH_QUERY =  gql`
+query JobMatch($jobId:String!) {
+  jobMatch(jobId:$jobId){
+    score
+    user {
+      ...UserForJobMatch
+    }
+  }
+}
+${USER_FOR_JOB_MATCH_FRAGMENT}
+`;

src/api/queries/jobSeekerCompleteMatchesQuery.ts

@@ -0,0 +1,25 @@
+import gql from "graphql-tag";
+import { IJob } from "../../models/Job";
+
+export type JobSeekerMatchOverviewsVariables = {
+  userId: string;
+}
+
+export type JobSeekerMatchOverviewsResult = {
+  JobSeekerMatchOverviews: IJob[] | undefined;
+}
+
+export const JOB_SEEKER_MATCH_OVERVIEWS_QUERY =  gql`
+query JobSeekerMatchOverviews($userId:String!) {
+  JobSeekerMatchOverviews: jobSeekerCompleteMatches(jobSeekerUserId:$userId){
+    _id
+    name
+    description
+    company{
+      _id
+      name
+      logoUrl
+    }
+  }
+}
+`;

src/mock/Users.ts

@@ -1,19 +1,19 @@
 import { IUser } from '../models/User';
 
 export const MOCK_USERS: IUser[] = [{
-  _id: 1,
+  _id: '1',
   email: 'mock.user@email.com',
   company: undefined,
   jobSeeker: undefined,
   isCompany: false,
 }, {
-  _id: 2,
+  _id: '2',
   email: 'mock.user.2@email.com',
   company: undefined,
   jobSeeker: undefined,
   isCompany: false,
 }, {
-  _id: 3,
+  _id: '3',
   email: 'mock.user.3@email.com',
   company: undefined,
   jobSeeker: undefined,

src/models/Competence.ts

@@ -0,0 +1,5 @@
+export interface ICompetence {
+  _id: string;
+  skill: string;
+  level: 'Basic' | 'Intermediate' | 'Advanced';
+}

src/models/Job.ts

@@ -1,14 +1,19 @@
 import { ICompany } from './Company';
 import { IEducation } from './Education';
 import { IUser } from './User';
+import { ICompetence } from './Competence';
 
 export interface IJob {
   _id: string;
   company: ICompany;
   name: string;
   description: string;
+  location: string;
+  typeofwork: number;
+  salary: number;
   education: IEducation[];
   jobSeekerInterest: IUser[];
   companyInterest: IUser[];
   completeJobSeekerMatch: IUser[];
-}
+  competence: ICompetence[];
+}