Edited all relations on deletes

- Functions project is removed
BenjaVR · Feb 5, 2019 · 8e59ec5 · 8e59ec5 · BenjaVR · Feb 5, 2019
1 parent a7d8fee
commit 8e59ec5
Show file tree

Hide file tree

Showing 82 changed files with 183 additions and 1,171 deletions.
diff --git a/.gitignore b/.gitignore
@@ -65,4 +65,26 @@ node_modules/
 .env
 
 # IDE
-.idea
+.idea
+
+# dependencies
+/node_modules
+/.pnp
+.pnp.js
+
+# testing
+/coverage
+
+# production
+/build
+
+# misc
+.DS_Store
+.env.local
+.env.development.local
+.env.test.local
+.env.production.local
+
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -6,16 +6,10 @@
         {
             "type": "npm",
             "script": "start",
-            "path": "web/",
             "problemMatcher": [
                 "$tsc-watch"
             ],
             "isBackground": true,
-            "group": "build"
-        },
-        {
-            "type": "npm",
-            "script": "build",
             "group": {
                 "kind": "build",
                 "isDefault": true

diff --git a/firebase.json b/firebase.json
@@ -3,14 +3,8 @@
         "rules": "firestore.rules",
         "indexes": "firestore.indexes.json"
     },
-    "functions": {
-        "predeploy": [
-            "npm --prefix \"%RESOURCE_DIR%\" run lint",
-            "npm --prefix \"%RESOURCE_DIR%\" run build"
-        ]
-    },
     "hosting": {
-        "public": "web/build",
+        "public": "./build",
         "ignore": [
             "firebase.json",
             "**/.*",
@@ -23,4 +17,4 @@
             }
         ]
     }
-}
+}
diff --git a/functions/.gitignore b/functions/.gitignore
diff --git a/functions/package.json b/functions/package.json
diff --git a/functions/server/ModelMapper.ts b/functions/server/ModelMapper.ts
diff --git a/functions/server/index.ts b/functions/server/index.ts
diff --git a/functions/shared/contract/IDepartment.ts b/functions/shared/contract/IDepartment.ts
diff --git a/functions/shared/contract/IEducation.ts b/functions/shared/contract/IEducation.ts
diff --git a/functions/shared/contract/IFirebaseTable.ts b/functions/shared/contract/IFirebaseTable.ts
diff --git a/functions/shared/contract/IInternship.ts b/functions/shared/contract/IInternship.ts
diff --git a/functions/shared/contract/ISchool.ts b/functions/shared/contract/ISchool.ts
diff --git a/functions/shared/contract/IStudent.ts b/functions/shared/contract/IStudent.ts
diff --git a/functions/tsconfig.json b/functions/tsconfig.json
diff --git a/functions/tslint.json b/functions/tslint.json
diff --git a/package.json b/package.json
@@ -1,28 +1,50 @@
 {
-    "name": "studentplanner",
-    "private": true,
+    "name": "studentplanner-web",
     "version": "1.0.0",
+    "private": true,
+    "dependencies": {
+        "@types/react-color": "^2.14.0",
+        "antd": "3.12.1",
+        "classnames": "2.2.6",
+        "core-js": "2.6.1",
+        "firebase": "5.7.1",
+        "jest": "23.6.0",
+        "moment": "2.23.0",
+        "react": "16.7.0",
+        "react-color": "2.17.0",
+        "react-dom": "16.7.0",
+        "react-helmet": "5.2.0",
+        "react-router": "4.3.1",
+        "react-router-dom": "4.3.1",
+        "whatwg-fetch": "3.0.0"
+    },
     "scripts": {
-        "build-web": "npm --prefix web run start",
-        "build-functions": "npm --prefix functions run build:watch",
-        "build": "npm-run-all --continue-on-error --parallel build-functions build-web",
-        "lint-web": "npm --prefix web run lint",
-        "lint-functions": "npm --prefix functions run lint",
-        "lint": "npm-run-all --continue-on-error --parallel lint-functions lint-web",
+        "start": "react-scripts start",
+        "build": "react-scripts build",
+        "test": "react-scripts test",
+        "lint": "tslint --project tsconfig.json",
         "deploy": "firebase deploy"
     },
-    "repository": "git+https://github.com/BenjaVR/StudentPlanner.git",
-    "author": "Benjamin Van Renterghem",
-    "license": "ISC",
-    "bugs": {
-        "url": "https://github.com/BenjaVR/StudentPlanner/issues"
-    },
-    "homepage": "https://github.com/BenjaVR/StudentPlanner#readme",
+    "browserslist": [
+        ">0.2%",
+        "not dead",
+        "not ie < 11",
+        "not op_mini all"
+    ],
     "devDependencies": {
-        "npm-run-all": "4.1.5"
-    },
-    "workspaces": [
-        "web",
-        "functions"
-    ]
+        "@types/classnames": "2.2.7",
+        "@types/jest": "23.3.10",
+        "@types/node": "10.12.18",
+        "@types/react": "16.7.18",
+        "@types/react-dom": "16.0.11",
+        "@types/react-helmet": "5.0.7",
+        "@types/react-router": "4.4.3",
+        "@types/react-router-dom": "4.3.1",
+        "node-sass": "4.11.0",
+        "react-scripts": "2.1.1",
+        "tslint": "5.12.0",
+        "tslint-react": "3.6.0",
+        "typescript": "3.2.2",
+        "typescript-plugin-css-modules": "1.0.5"
+    }
 }
diff --git a/web/public/favicon.ico → public/favicon.ico b/web/public/favicon.ico → public/favicon.ico
diff --git a/web/public/index.html → public/index.html b/web/public/index.html → public/index.html
diff --git a/web/public/manifest.json → public/manifest.json b/web/public/manifest.json → public/manifest.json
diff --git a/web/src/components/DataTable.module.scss → src/components/DataTable.module.scss b/web/src/components/DataTable.module.scss → src/components/DataTable.module.scss
diff --git a/web/src/components/Root.tsx → src/components/Root.tsx b/web/src/components/Root.tsx → src/components/Root.tsx
diff --git a/...c/components/auth/AuthChecker.module.scss → src/components/auth/AuthChecker.module.scss b/...c/components/auth/AuthChecker.module.scss → src/components/auth/AuthChecker.module.scss
diff --git a/web/src/components/auth/AuthChecker.tsx → src/components/auth/AuthChecker.tsx b/web/src/components/auth/AuthChecker.tsx → src/components/auth/AuthChecker.tsx
diff --git a/...mponents/auth/login/LoginForm.module.scss → ...mponents/auth/login/LoginForm.module.scss b/...mponents/auth/login/LoginForm.module.scss → ...mponents/auth/login/LoginForm.module.scss
diff --git a/web/src/components/auth/login/LoginForm.tsx → src/components/auth/login/LoginForm.tsx b/web/src/components/auth/login/LoginForm.tsx → src/components/auth/login/LoginForm.tsx
diff --git a/...mponents/auth/login/LoginPage.module.scss → ...mponents/auth/login/LoginPage.module.scss b/...mponents/auth/login/LoginPage.module.scss → ...mponents/auth/login/LoginPage.module.scss
diff --git a/web/src/components/auth/login/LoginPage.tsx → src/components/auth/login/LoginPage.tsx b/web/src/components/auth/login/LoginPage.tsx → src/components/auth/login/LoginPage.tsx
diff --git a/...nents/containers/AppContainer.module.scss → ...nents/containers/AppContainer.module.scss b/...nents/containers/AppContainer.module.scss → ...nents/containers/AppContainer.module.scss
diff --git a/...rc/components/containers/AppContainer.tsx → src/components/containers/AppContainer.tsx b/...rc/components/containers/AppContainer.tsx → src/components/containers/AppContainer.tsx
diff --git a/...artments/DepartmentsFormModal.module.scss → ...artments/DepartmentsFormModal.module.scss b/...artments/DepartmentsFormModal.module.scss → ...artments/DepartmentsFormModal.module.scss
diff --git a/...ents/departments/DepartmentsFormModal.tsx → ...ents/departments/DepartmentsFormModal.tsx b/...ents/departments/DepartmentsFormModal.tsx → ...ents/departments/DepartmentsFormModal.tsx
diff --git a/...omponents/departments/DepartmentsPage.tsx → ...omponents/departments/DepartmentsPage.tsx b/...omponents/departments/DepartmentsPage.tsx → ...omponents/departments/DepartmentsPage.tsx
diff --git a/...mponents/departments/DepartmentsTable.tsx → ...mponents/departments/DepartmentsTable.tsx b/...mponents/departments/DepartmentsTable.tsx → ...mponents/departments/DepartmentsTable.tsx
diff --git a/...onents/educations/EducationsFormModal.tsx → ...onents/educations/EducationsFormModal.tsx b/...onents/educations/EducationsFormModal.tsx → ...onents/educations/EducationsFormModal.tsx
diff --git a/.../components/educations/EducationsPage.tsx → src/components/educations/EducationsPage.tsx b/.../components/educations/EducationsPage.tsx → src/components/educations/EducationsPage.tsx
diff --git a/...components/educations/EducationsTable.tsx → ...components/educations/EducationsTable.tsx b/...components/educations/EducationsTable.tsx → ...components/educations/EducationsTable.tsx
diff --git a/...omponents/planning/PlanningsFormModal.tsx → ...omponents/planning/PlanningsFormModal.tsx b/...omponents/planning/PlanningsFormModal.tsx → ...omponents/planning/PlanningsFormModal.tsx
diff --git a/...onents/planning/PlanningsPage.module.scss → ...onents/planning/PlanningsPage.module.scss b/...onents/planning/PlanningsPage.module.scss → ...onents/planning/PlanningsPage.module.scss
diff --git a/...src/components/planning/PlanningsPage.tsx → src/components/planning/PlanningsPage.tsx b/...src/components/planning/PlanningsPage.tsx → src/components/planning/PlanningsPage.tsx
diff --git a/...c/components/schools/SchoolsFormModal.tsx → src/components/schools/SchoolsFormModal.tsx b/...c/components/schools/SchoolsFormModal.tsx → src/components/schools/SchoolsFormModal.tsx
diff --git a/web/src/components/schools/SchoolsPage.tsx → src/components/schools/SchoolsPage.tsx b/web/src/components/schools/SchoolsPage.tsx → src/components/schools/SchoolsPage.tsx
diff --git a/web/src/components/schools/SchoolsTable.tsx → src/components/schools/SchoolsTable.tsx b/web/src/components/schools/SchoolsTable.tsx → src/components/schools/SchoolsTable.tsx
diff --git a/...components/students/StudentsFormModal.tsx → ...components/students/StudentsFormModal.tsx b/...components/students/StudentsFormModal.tsx → ...components/students/StudentsFormModal.tsx
diff --git a/web/src/components/students/StudentsPage.tsx → src/components/students/StudentsPage.tsx b/web/src/components/students/StudentsPage.tsx → src/components/students/StudentsPage.tsx
diff --git a/...src/components/students/StudentsTable.tsx → src/components/students/StudentsTable.tsx b/...src/components/students/StudentsTable.tsx → src/components/students/StudentsTable.tsx
diff --git a/web/src/entities/IDepartment.ts → src/entities/IDepartment.ts b/web/src/entities/IDepartment.ts → src/entities/IDepartment.ts
diff --git a/web/src/entities/IEducation.ts → src/entities/IEducation.ts b/web/src/entities/IEducation.ts → src/entities/IEducation.ts
diff --git a/web/src/entities/IFirestoreEntityBase.ts → src/entities/IFirestoreEntityBase.ts b/web/src/entities/IFirestoreEntityBase.ts → src/entities/IFirestoreEntityBase.ts
diff --git a/web/src/entities/IInternship.ts → src/entities/IInternship.ts b/web/src/entities/IInternship.ts → src/entities/IInternship.ts
diff --git a/web/src/entities/ISchool.ts → src/entities/ISchool.ts b/web/src/entities/ISchool.ts → src/entities/ISchool.ts
diff --git a/web/src/entities/IStudent.ts → src/entities/IStudent.ts b/web/src/entities/IStudent.ts → src/entities/IStudent.ts
diff --git a/web/src/helpers/comparers.ts → src/helpers/comparers.ts b/web/src/helpers/comparers.ts → src/helpers/comparers.ts
diff --git a/web/src/helpers/filters.ts → src/helpers/filters.ts b/web/src/helpers/filters.ts → src/helpers/filters.ts
diff --git a/web/src/helpers/nameof.ts → src/helpers/nameof.ts b/web/src/helpers/nameof.ts → src/helpers/nameof.ts
diff --git a/web/src/helpers/sorters.ts → src/helpers/sorters.ts b/web/src/helpers/sorters.ts → src/helpers/sorters.ts
diff --git a/web/src/helpers/types.ts → src/helpers/types.ts b/web/src/helpers/types.ts → src/helpers/types.ts
diff --git a/web/src/index.scss → src/index.scss b/web/src/index.scss → src/index.scss
diff --git a/web/src/index.tsx → src/index.tsx b/web/src/index.tsx → src/index.tsx
diff --git a/web/src/models/Department.ts → src/models/Department.ts b/web/src/models/Department.ts → src/models/Department.ts
diff --git a/web/src/models/Education.ts → src/models/Education.ts b/web/src/models/Education.ts → src/models/Education.ts
diff --git a/web/src/models/Internship.ts → src/models/Internship.ts b/web/src/models/Internship.ts → src/models/Internship.ts
@@ -10,7 +10,7 @@ export class Internship extends ModelBase<IInternship> {
         public endDate: moment.Moment,
         public hours: number,
         public studentId: string,
-        public departmentId: string,
+        public departmentId: string | undefined,
     ) {
         super();
     }
@@ -21,7 +21,7 @@ export class Internship extends ModelBase<IInternship> {
             moment.utc(entity.endDate.toDate()),
             entity.hours || 0,
             entity.studentId!,
-            entity.departmentId!,
+            entity.departmentId,
         );
         internship.fillBaseFields(entity);
         return internship;

diff --git a/web/src/models/ModelBase.ts → src/models/ModelBase.ts b/web/src/models/ModelBase.ts → src/models/ModelBase.ts
diff --git a/web/src/models/School.ts → src/models/School.ts b/web/src/models/School.ts → src/models/School.ts
diff --git a/web/src/models/Student.ts → src/models/Student.ts b/web/src/models/Student.ts → src/models/Student.ts
diff --git a/web/src/polyfill.ts → src/polyfill.ts b/web/src/polyfill.ts → src/polyfill.ts
diff --git a/web/src/react-app-env.d.ts → src/react-app-env.d.ts b/web/src/react-app-env.d.ts → src/react-app-env.d.ts
diff --git a/web/src/routes.ts → src/routes.ts b/web/src/routes.ts → src/routes.ts
diff --git a/web/src/services/FirebaseInitializer.ts → src/services/FirebaseInitializer.ts b/web/src/services/FirebaseInitializer.ts → src/services/FirebaseInitializer.ts
diff --git a/web/src/services/FirebaseModelMapper.ts → src/services/FirebaseModelMapper.ts b/web/src/services/FirebaseModelMapper.ts → src/services/FirebaseModelMapper.ts
diff --git a/web/src/services/FirestoreRefs.ts → src/services/FirestoreRefs.ts b/web/src/services/FirestoreRefs.ts → src/services/FirestoreRefs.ts
diff --git a/...ces/repositories/DepartmentsRepository.ts → ...ces/repositories/DepartmentsRepository.ts b/...ces/repositories/DepartmentsRepository.ts → ...ces/repositories/DepartmentsRepository.ts
@@ -4,6 +4,7 @@ import { Department } from "../../models/Department";
 import { Education } from "../../models/Education";
 import { FirebaseModelMapper } from "../FirebaseModelMapper";
 import { FirestoreRefs } from "../FirestoreRefs";
+import { InternshipsRepository } from "./InternshipsRepository";
 
 export class DepartmentsRepository {
 
@@ -55,6 +56,13 @@ export class DepartmentsRepository {
         }
         await FirestoreRefs.getDepartmentDocRef(department.id)
             .delete();
+
+        // Delete relations with internships
+        const internships = await InternshipsRepository.getInternshipsForDepartment(department);
+        internships.forEach(async (internship) => {
+            internship.departmentId = undefined;
+            InternshipsRepository.updateInternship(internship, true);
+        });
     }
 
     public static async deleteEducationRelations(education: Education): Promise<void> {

diff --git a/...ices/repositories/EducationsRepository.ts → ...ices/repositories/EducationsRepository.ts b/...ices/repositories/EducationsRepository.ts → ...ices/repositories/EducationsRepository.ts