diff --git a/composer.json b/composer.json index 6232c425f..bda1f1286 100644 --- a/composer.json +++ b/composer.json @@ -51,7 +51,7 @@ "eher/oauth": "1.0.7", "aws/aws-sdk-php": "3.67.17", "symfony/dotenv": "^5.1", - "ucfopen/materia-theme-ucf": "2.0.1" + "ucfopen/materia-theme-ucf": "2.0.2" }, "suggest": { "ext-memcached": "*" @@ -97,9 +97,9 @@ "package": { "name": "ucfopen/materia-theme-ucf", "type": "fuel-package", - "version": "2.0.1", + "version": "2.0.2", "dist": { - "url": "https://github.com/ucfopen/Materia-Theme-UCF/archive/refs/tags/v2.0.1.zip", + "url": "https://github.com/ucfopen/Materia-Theme-UCF/archive/refs/tags/v2.0.2.zip", "type": "zip" }, "source": { diff --git a/composer.lock b/composer.lock index dd0ada3be..904ea0ff7 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "6cd12e58a2eadc64a08ed0a8f5d0cf24", + "content-hash": "f25597c889d3990ca0401225ac22f8a2", "packages": [ { "name": "aws/aws-sdk-php", @@ -1972,7 +1972,7 @@ }, { "name": "ucfopen/materia-theme-ucf", - "version": "2.0.1", + "version": "2.0.2", "source": { "type": "git", "url": "https://github.com/ucfopen/Materia-Theme-UCF.git", @@ -1980,7 +1980,7 @@ }, "dist": { "type": "zip", - "url": "https://github.com/ucfopen/Materia-Theme-UCF/archive/refs/tags/v2.0.1.zip" + "url": "https://github.com/ucfopen/Materia-Theme-UCF/archive/refs/tags/v2.0.2.zip" }, "type": "fuel-package" } diff --git a/materia-fake-s3.Dockerfile b/materia-fake-s3.Dockerfile index 73a821cef..8e2a2d169 100644 --- a/materia-fake-s3.Dockerfile +++ b/materia-fake-s3.Dockerfile @@ -1,4 +1,4 @@ -FROM ruby:2.5-alpine +FROM ruby:2.6-alpine RUN gem install fakes3 -v 2.0.0 --no-document diff --git a/src/components/my-widgets-score-semester-individual.jsx b/src/components/my-widgets-score-semester-individual.jsx index ce6994872..5c20c0dca 100644 --- a/src/components/my-widgets-score-semester-individual.jsx +++ b/src/components/my-widgets-score-semester-individual.jsx @@ -41,7 +41,7 @@ const MyWidgetScoreSemesterIndividual = ({ semester, instId }) => { let newLogs = state.logs result.pagination.forEach((record) => { - if (newLogs[record.userId]) newLogs[record.userId].scores.push({...record.scores}) + if (newLogs[record.userId]) newLogs[record.userId].scores.push(...record.scores) else newLogs[record.userId] = { userId: record.userId, name: record.name, searchableName: record.searchableName, scores: record.scores } newLogs[record.userId].scores.sort(_compareScores) }) diff --git a/src/components/user-admin-page.scss b/src/components/user-admin-page.scss index dd626469b..2082ee035 100644 --- a/src/components/user-admin-page.scss +++ b/src/components/user-admin-page.scss @@ -87,6 +87,18 @@ > div { display: inline-block; + + &.img-holder { + display: inline-block; + + img { + width: 50px; + height: 50px; + border-radius: 3px; + display: inline-block; + margin-right: 10px; + } + } } }