Merge branch 'master' into model_relationship

backend/reset_db_and_migrate.sh

@@ -3,7 +3,6 @@ docker-compose up -d postgres;
 sleep 1;
 ./node_modules/.bin/ts-node ./node_modules/.bin/typeorm migration:generate -n Init;
 echo "
-
 -------------------------------------------------------------------------------------
 Replace used migration InitFile in src/index.ts with the newly createt version.
 -------------------------------------------------------------------------------------

backend/schema.graphql

@@ -32,6 +32,7 @@ enum ApplicationState {
   PENDING
   DECLINED
   APPROVED
+
 }
 
 input CreateJobInput {

backend/src/graphql/resolvers/_mutations/index.ts

@@ -10,6 +10,7 @@ import removeBookmark from "./removeBookmark";
 import approve from "./approve";
 import apply from "./apply";
 
+
 export const Mutation: MutationResolvers.Type = {
   createJob,
   updateJob,
@@ -21,6 +22,7 @@ export const Mutation: MutationResolvers.Type = {
   removeBookmark,
   apply,
   approve
+
 };
 
 export default Mutation;

backend/src/graphql/resolvers/_queries/jobs.test.ts

@@ -8,6 +8,7 @@ import { OrganizationRepository } from "../../../repository/OrganizationReposito
 import { UserRepository } from "../../../repository/UserRepository";
 import { ApplicationRepository } from "../../../repository/ApplicationRepository";
 
+
 describe("Get likedJobs", () => {
   const schema = makeExecutableSchema({
     typeDefs: importSchema("./schema.graphql"),

backend/src/index.ts

@@ -19,6 +19,7 @@ import { Application } from "./entity/Application";
 import { ApplicationRepository } from "./repository/ApplicationRepository";
 import { Init1541547194885 } from "./migration/1541547194885-Init";
 
+
 //TODO environment variable for logging (e.g. NODE_ENV)
 createConnection({
   type: "postgres",

backend/src/migration/1541366395158-Init.ts

@@ -0,0 +1,47 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class Init1541366395158 implements MigrationInterface {
+  public async up(queryRunner: QueryRunner): Promise<any> {
+    await queryRunner.query(
+      `CREATE TABLE "organizations" ("id" uuid NOT NULL DEFAULT uuid_generate_v4(), "name" text NOT NULL, CONSTRAINT "PK_6b031fcd0863e3f6b44230163f9" PRIMARY KEY ("id"))`
+    );
+    await queryRunner.query(
+      `CREATE TABLE "users" ("id" uuid NOT NULL DEFAULT uuid_generate_v4(), "firstname" text NOT NULL, "lastname" text NOT NULL, "phone" text NOT NULL, "email" text NOT NULL, "password" text NOT NULL, CONSTRAINT "UQ_97672ac88f789774dd47f7c8be3" UNIQUE ("email"), CONSTRAINT "PK_a3ffb1c0c8416b9fc6f907b7433" PRIMARY KEY ("id"))`
+    );
+    await queryRunner.query(
+      `CREATE TABLE "jobs" ("id" uuid NOT NULL DEFAULT uuid_generate_v4(), "title" text NOT NULL, "description" text NOT NULL, "salary" float NOT NULL, "start" date NOT NULL, "end" TIMESTAMP, "organizationId" uuid, CONSTRAINT "PK_cf0a6c42b72fcc7f7c237def345" PRIMARY KEY ("id"))`
+    );
+    await queryRunner.query(
+      `CREATE TABLE "roles" ("id" uuid NOT NULL DEFAULT uuid_generate_v4(), "title" text NOT NULL, "description" text NOT NULL, CONSTRAINT "PK_c1433d71a4838793a49dcad46ab" PRIMARY KEY ("id"))`
+    );
+    await queryRunner.query(
+      `CREATE TABLE "bookmarks" ("usersId" uuid NOT NULL, "jobsId" uuid NOT NULL, CONSTRAINT "PK_59b0563d7b6f7758e9f369bb324" PRIMARY KEY ("usersId", "jobsId"))`
+    );
+    await queryRunner.query(
+      `ALTER TABLE "jobs" ADD CONSTRAINT "FK_08bdc8b939f39e6d55b4c38cfb9" FOREIGN KEY ("organizationId") REFERENCES "organizations"("id")`
+    );
+    await queryRunner.query(
+      `ALTER TABLE "bookmarks" ADD CONSTRAINT "FK_b0075fdec79957795cd75fb7bb9" FOREIGN KEY ("usersId") REFERENCES "users"("id") ON DELETE CASCADE`
+    );
+    await queryRunner.query(
+      `ALTER TABLE "bookmarks" ADD CONSTRAINT "FK_4d0391697f8d396f21846c8784a" FOREIGN KEY ("jobsId") REFERENCES "jobs"("id") ON DELETE CASCADE`
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<any> {
+    await queryRunner.query(
+      `ALTER TABLE "bookmarks" DROP CONSTRAINT "FK_4d0391697f8d396f21846c8784a"`
+    );
+    await queryRunner.query(
+      `ALTER TABLE "bookmarks" DROP CONSTRAINT "FK_b0075fdec79957795cd75fb7bb9"`
+    );
+    await queryRunner.query(
+      `ALTER TABLE "jobs" DROP CONSTRAINT "FK_08bdc8b939f39e6d55b4c38cfb9"`
+    );
+    await queryRunner.query(`DROP TABLE "bookmarks"`);
+    await queryRunner.query(`DROP TABLE "roles"`);
+    await queryRunner.query(`DROP TABLE "jobs"`);
+    await queryRunner.query(`DROP TABLE "users"`);
+    await queryRunner.query(`DROP TABLE "organizations"`);
+  }
+}

backend/src/repository/UserRepository.ts

@@ -47,6 +47,7 @@ export class UserRepository {
   }
 
   async removeBookmark(jobId: string, session: Express.Session): Promise<any> {
+
     Utils.enforceAuth(session);
 
     await getConnection()

frontend/components/student/StudentJobCard.tsx

@@ -0,0 +1,56 @@
+import {Button, Card, Header, Loader} from "semantic-ui-react";
+import * as React from "react";
+import {SingletonRouter} from "next/router";
+import Link from "next/link";
+import ApolloError from 'apollo-boost';
+
+interface StudentJobCardProps {
+    router?: SingletonRouter,
+    job: {
+        id: string,
+        title: string,
+        description: string
+    },
+    loading: boolean,
+    error: ApolloError;
+}
+
+
+const StudentJobCard: React.SFC<StudentJobCardProps> = ({router, job, loading, error}) => {
+
+    if (loading) {
+        return (
+            <Card>
+                <Loader/>
+            </Card>
+        );
+    }
+    if (error) {
+        return (
+            <Card>
+                <Header as="h3">Ooops</Header>
+            </Card>
+        );
+    }
+
+    return (
+        <Card>
+            <Card.Content>
+                <Card.Header>{job.title}</Card.Header>
+                <Card.Description>
+                    {job.description}
+                </Card.Description>
+            </Card.Content>
+            <Card.Content extra>
+                <div className='ui two buttons'>
+                    <Button icon="star"/>
+                    <Link href={{pathname: "/jobs/detail", query: {id: job.id}}}>
+                        <Button icon="eye"/>
+                    </Link>
+                </div>
+            </Card.Content>
+        </Card>
+    );
+};
+
+export default StudentJobCard;

frontend/components/student/activity/StudentActivities.tsx

@@ -0,0 +1,63 @@
+import {SingletonRouter} from "next/router";
+import * as React from "react";
+import {Card, Header, Loader, Segment} from "semantic-ui-react";
+import {ApolloError} from "apollo-boost";
+import gql from "graphql-tag";
+import {Query} from "react-apollo";
+import StudentActivity from "./StudentActivity";
+import StudentJobCard from "../StudentJobCard";
+
+
+interface ActivitiesJobs {
+    jobs: {
+        id: string;
+        title: string;
+        description: string;
+        organization: { id: string; name };
+    }[];
+}
+
+
+interface StudentActivitiesProps {
+    router?: SingletonRouter;
+    loading: boolean;
+    error: ApolloError;
+    data: ActivitiesJobs;
+}
+
+export const GET_ACTIVITIES_JOBS = gql`
+    query StudentActivities {
+        jobs {
+          id
+          title
+          description
+          organization {
+            id
+            name
+          }
+        }
+      }
+`;
+
+
+const StudentActivities: React.SFC<StudentActivitiesProps> = ({router, loading, error, data}) => {
+    return (
+        <Segment>
+            <Header>My Activities</Header>
+            <Card.Group itemsPerRow={3} centered>
+                {data.jobs.map(job => (
+                    <StudentActivity key={job.id} job={job} loading={loading} error={error}/>
+                ))}
+            </Card.Group>
+        </Segment>
+    );
+};
+
+
+export default () => (
+    <Query query={GET_ACTIVITIES_JOBS}>
+        {({loading, error, data}) => (
+            <StudentActivities data={data} error={error} loading={loading}/>
+        )}
+    </Query>
+);

frontend/components/student/activity/StudentActivity.tsx

@@ -0,0 +1,46 @@
+import * as React from "react";
+import {Card, Header, Loader} from "semantic-ui-react";
+import ApolloError from 'apollo-boost'
+
+interface StudentActivitiesProps {
+    job: {
+        id: string,
+        title: string,
+        description: string
+        organisation: {
+            id: string,
+            name: string
+        }
+    },
+    loading: boolean,
+    error: ApolloError
+}
+
+const StudentActivity: React.SFC<StudentActivitiesProps> = ({job, loading, error}) => {
+
+    if (loading) {
+        return (
+            <Card>
+                <Loader/>
+            </Card>
+        );
+    }
+    if (error) {
+        return (
+            <Card>
+                <Header as="h3">Ooops</Header>
+            </Card>
+        );
+    }
+
+    return (
+        <Card>
+            <Card.Content>
+                <Card.Header>{job.title}</Card.Header>
+                <Card.Meta>{job.description}</Card.Meta>
+            </Card.Content>
+        </Card>
+    );
+};
+
+export default StudentActivity;

frontend/components/student/dashboard/StudentDashboard.tsx

@@ -0,0 +1,18 @@
+import withAuthorization from "../../Auth/withAuthorization";
+import Me from "../../Auth/Me";
+import * as React from "react";
+import {Container} from "semantic-ui-react";
+import RecommendedJobs from "../recomendedjobs/RecommendedJobs";
+import StudentActivities from "../activity/StudentActivities";
+import StudentWatching from "../watching/StudentWatching";
+
+const StudentDashboard = () => (
+    <Container>
+        <Me/>
+        <RecommendedJobs/>
+        <StudentActivities/>
+        <StudentWatching/>
+    </Container>
+);
+
+export default withAuthorization(StudentDashboard);

frontend/components/student/recomendedjobs/RecommendedJobs.tsx

@@ -0,0 +1,75 @@
+import StudentJobCard from "../StudentJobCard";
+import * as React from "react";
+import {Query} from "react-apollo";
+import gql from "graphql-tag";
+import {Card, Header, Loader, Segment} from "semantic-ui-react";
+import {ApolloError} from "apollo-boost";
+
+export const GET_RECOMMENDED_JOBS = gql`
+  query RecommendedJobs {
+    jobs {
+      id
+      title
+      description
+      organization {
+        id
+        name
+      }
+    }
+  }
+`;
+
+interface RecommendedJobsProps {
+    loading: boolean;
+    error: ApolloError;
+    data: AllJobs;
+}
+
+
+const RecommendedJobs: React.SFC<RecommendedJobsProps> = ({loading, error, data}) => {
+
+    if (loading) {
+        return (
+            <Segment>
+                <Header as="h3">Recommended Jobs</Header>
+                <Card.Group itemsPerRow={3} centered>
+                    <Card><Loader/></Card>
+                    <Card><Loader/></Card>
+                    <Card><Loader/></Card>
+                </Card.Group>
+            </Segment>
+        )
+    }
+
+    if (error) {
+        return (
+            <Segment>
+                <Header as="h3">Recommended Jobs</Header>
+                <Card.Group itemsPerRow={3} centered>
+                    <Card><Header as="h3">Ooops</Header></Card>
+                    <Card><Header as="h3">Ooops</Header></Card>
+                    <Card><Header as="h3">Ooops</Header></Card>
+                </Card.Group>
+            </Segment>
+        )
+    }
+
+    return (
+        <Segment>
+            <Header as="h3">Recommended Jobs</Header>
+            <Card.Group itemsPerRow={3} centered>
+                {data.jobs.map(job => (
+                    <StudentJobCard key={job.id} job={job}/>
+                ))}
+            </Card.Group>
+        </Segment>
+    );
+};
+
+export default () => (
+    <Query query={GET_RECOMMENDED_JOBS}>
+        {({loading, error, data}) => (
+            <RecommendedJobs data={data} error={error} loading={loading}/>
+        )}
+    </Query>
+);