Merge branch 'update-types' into 'dev'

update types

See merge request !9

src/client/types.ts

-import { Profile } from '../types/types';
+import { IProfile } from '../types/Profile';
 
 export type EmptyReq = undefined;
 
@@ -11,5 +11,5 @@ export type RegisterReq = {
   password: string;
 };
 export type UserResponse = {
-  user: Profile;
+  user: IProfile;
 };

src/context/UserContext.tsx

 import React, { createContext, useState } from 'react';
-import { Profile, Role } from '../types/types';
+import { IProfile, Role } from '../types/Profile';
 
 interface ContextProps {
-  profile: Profile;
-  setProfile: (profile: Profile) => void;
+  profile: IProfile;
+  setProfile: (profile: IProfile) => void;
 }
 
 // Context
-const initialState: Profile = {
-  external_id: 'abcd',
+const initialState: IProfile = {
+  externalId: 'abcd',
   studentCardNumber: '1234',
-  roomNumber: '104',
-  picture: 'alma.jpg',
+  roomNumber: 104,
   role: Role.User,
   email: 'alma@gmail.com',
   name: 'Nagy Gizike',
   warnings: [],
+  notices: [],
 };
 export const userContext = createContext({} as ContextProps);
 const { Provider } = userContext;
 
 export const UserStateProvider: React.FC = ({ children }) => {
-  const [profile, setProfile] = useState<Profile>(initialState);
+  const [profile, setProfile] = useState<IProfile>(initialState);
 
   return <Provider value={{ profile, setProfile }}>{children}</Provider>;
 };

src/types/News.ts

+export interface INews {
+  title: string;
+  text: string;
+  publishedAt: Date;
+  publishedBy: string;
+  updatedBy?: string;
+}

src/types/Profile.ts

+export enum Role {
+  Admin = 'ADMIN',
+  User = 'USER',
+}
+
+export interface INotice {
+  _id: string;
+  text: string;
+  redirect?: string;
+  isSeen: boolean;
+}
+
+export interface IWarning {
+  _id: string;
+  text: string;
+  date: Date;
+  givenBy: string;
+}
+
+export interface IProfile {
+  externalId: string;
+  studentCardNumber?: string;
+  roomNumber?: Number;
+  newPicture?: string;
+  acceptedPicture?: string;
+  role: Role;
+  email: string;
+  name: string;
+  isStaffMember?: boolean;
+  staffMemberText?: string;
+  warnings: IWarning[];
+  notices: INotice[];
+}

src/types/Term.ts

+export enum MemberState {
+  Accepted = 'ACCEPTED',
+  Applied = 'APPLIED',
+  Rejected = 'REJECTED',
+}
+
+export enum CardState {
+  Created = 'CREATED',
+  Printed = 'PRINTED',
+  Given = 'GIVEN',
+}
+
+export interface IMember {
+  user: string;
+  memberState: MemberState;
+  cardState: CardState;
+  cardNumber: number;
+  cardReceiveDate?: Date;
+}
+
+export interface ITerm {
+  backgroundFile?: string;
+  name: string;
+  createDate?: Date;
+  startDate: Date;
+  endDate: Date;
+  deadline: Date;
+  members: IMember[];
+}

src/types/types.ts

-export enum Role {
-  Admin,
-  Staff,
-  User,
-}
-
-export interface Profile {
-  external_id: string;
-  studentCardNumber: string;
-  roomNumber?: string;
-  picture: string;
-  role: Role.Admin | Role.Staff | Role.User;
-  email?: string;
-  name?: string;
-  warnings: [Warnings] | [];
-}
-
-export interface Warnings {
-  text: string;
-  date: Date;
-  given_by: {
-    _id: string;
-    name: string;
-  };
-}
-
-export interface News {
-  title: string;
-  text: string;
-  publishedAt: string;
-}