From 97572b79dba6076e6e40084fdd1a4e76433f2677 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 5 Jan 2021 20:21:27 +0000 Subject: [PATCH 1/2] Bump axios from 0.19.2 to 0.21.1 Bumps [axios](https://github.com/axios/axios) from 0.19.2 to 0.21.1. - [Release notes](https://github.com/axios/axios/releases) - [Changelog](https://github.com/axios/axios/blob/v0.21.1/CHANGELOG.md) - [Commits](https://github.com/axios/axios/compare/v0.19.2...v0.21.1) Signed-off-by: dependabot[bot] --- package-lock.json | 39 +++++++++++++++++++++++++++++---------- package.json | 2 +- 2 files changed, 30 insertions(+), 11 deletions(-) diff --git a/package-lock.json b/package-lock.json index fc0c1b0..eec03c3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1839,6 +1839,16 @@ "requires": { "axios": "^0.19.0", "nprogress": "^0.2.0" + }, + "dependencies": { + "axios": { + "version": "0.19.2", + "resolved": "https://registry.npmjs.org/axios/-/axios-0.19.2.tgz", + "integrity": "sha512-fjgm5MvRHLhx+osE2xoekY70AhARk3a6hkN+3Io1jc00jtquGvxYlKlsFUhmUET0V5te6CcZI7lcv2Ym61mjHA==", + "requires": { + "follow-redirects": "1.5.10" + } + } } }, "@inertiajs/inertia-react": { @@ -2352,6 +2362,12 @@ "json5": "^1.0.1" } }, + "object-path": { + "version": "0.11.5", + "resolved": "https://registry.npmjs.org/object-path/-/object-path-0.11.5.tgz", + "integrity": "sha512-jgSbThcoR/s+XumvGMTMf81QVBmah+/Q7K7YduKeKVWL7N111unR2d6pZZarSk6kY/caeNxUDyxOvMWyzoU2eg==", + "dev": true + }, "util": { "version": "0.10.3", "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz", @@ -2675,11 +2691,20 @@ } }, "axios": { - "version": "0.19.2", - "resolved": "https://registry.npmjs.org/axios/-/axios-0.19.2.tgz", - "integrity": "sha512-fjgm5MvRHLhx+osE2xoekY70AhARk3a6hkN+3Io1jc00jtquGvxYlKlsFUhmUET0V5te6CcZI7lcv2Ym61mjHA==", + "version": "0.21.1", + "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.1.tgz", + "integrity": "sha512-dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA==", + "dev": true, "requires": { - "follow-redirects": "1.5.10" + "follow-redirects": "^1.10.0" + }, + "dependencies": { + "follow-redirects": { + "version": "1.13.1", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.13.1.tgz", + "integrity": "sha512-SSG5xmZh1mkPGyKzjZP8zLjltIfpW32Y5QpdNJyjcfGxK3qo3NDDkZOZSFiGn1A6SclQxY9GzEwAHQ3dmYRWpg==", + "dev": true + } } }, "babel-code-frame": { @@ -7682,12 +7707,6 @@ "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==", "dev": true }, - "object-path": { - "version": "0.11.4", - "resolved": "https://registry.npmjs.org/object-path/-/object-path-0.11.4.tgz", - "integrity": "sha1-NwrnUvvzfePqcKhhwju6iRVpGUk=", - "dev": true - }, "object-visit": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz", diff --git a/package.json b/package.json index cdb4006..967746e 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,7 @@ "@types/react-dom": "^16.9.8", "@typescript-eslint/eslint-plugin": "^2.34.0", "@typescript-eslint/parser": "^2.34.0", - "axios": "^0.19", + "axios": "^0.21", "cross-env": "^7.0.2", "eslint": "^6.8.0", "eslint-config-prettier": "^6.11.0", From 1510bebf5106c1507372374560d765309650fbb8 Mon Sep 17 00:00:00 2001 From: John Wyles Date: Tue, 5 Jan 2021 20:21:42 +0000 Subject: [PATCH 2/2] Apply fixes from StyleCI (#123) --- .../Controllers/Admin/Dashboard/AdminDashboardController.php | 1 - 1 file changed, 1 deletion(-) diff --git a/app/Http/Controllers/Admin/Dashboard/AdminDashboardController.php b/app/Http/Controllers/Admin/Dashboard/AdminDashboardController.php index 75a5fc0..20f3b71 100644 --- a/app/Http/Controllers/Admin/Dashboard/AdminDashboardController.php +++ b/app/Http/Controllers/Admin/Dashboard/AdminDashboardController.php @@ -28,7 +28,6 @@ public function index() $mentorshipSummary = []; $menteeMentorProfiles = MenteeProfile::whereHas('mentorProfiles')->get(); foreach ($menteeMentorProfiles as $mentee) { - $summary; $menteeUser = $mentee->user; $summary['menteeFirstName'] = $menteeUser->first_name; $summary['menteeLastName'] = $menteeUser->last_name;