Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: OpenTree-Education/rhizone-lms
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: main
Choose a base ref
...
head repository: seidior/rhizone-lms
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: main
Choose a head ref
Able to merge. These branches can be automatically merged.
Loading
Showing with 14,236 additions and 2,221 deletions.
  1. +1 −1 api/.nvmrc
  2. +1 −0 api/.yarnrc
  3. +2 −2 api/Dockerfile
  4. +23 −24 api/package.json
  5. +3,345 −0 api/src/middleware/__tests__/assessmentsRouter.ts
  6. +979 −0 api/src/middleware/assessmentsRouter.ts
  7. +9 −0 api/src/middleware/httpErrors.ts
  8. +2 −0 api/src/middleware/routerTestUtils.ts
  9. +108 −0 api/src/models.d.ts
  10. +52 −26 api/src/server.ts
  11. +3,110 −0 api/src/services/__tests__/assessmentsService.ts
  12. +4 −4 api/src/services/__tests__/questionnairesService.ts
  13. +1 −1 api/src/services/__tests__/reflectionsService.ts
  14. +1,769 −0 api/src/services/assessmentsService.ts
  15. +1 −1 api/src/services/db.ts
  16. +3 −3 api/src/services/questionnairesService.ts
  17. +9 −5 api/src/services/reflectionsService.ts
  18. +906 −867 api/yarn.lock
  19. +155 −0 db/migration/V021__create_assessments.sql
  20. +163 −0 db/migration/V022__insert_sample_assessment_data.sql
  21. +6 −5 docker-compose.yml
  22. +1 −1 nginx/Dockerfile
  23. +1 −1 webapp/.nvmrc
  24. +2 −2 webapp/Dockerfile
  25. +23 −23 webapp/package.json
  26. +27 −0 webapp/src/components/App.tsx
  27. +433 −0 webapp/src/components/AssessmentDetailPage.tsx
  28. +96 −0 webapp/src/components/AssessmentDisplay.tsx
  29. +247 −0 webapp/src/components/AssessmentMetadataBar.tsx
  30. +143 −0 webapp/src/components/AssessmentQuestionCard.tsx
  31. +269 −0 webapp/src/components/AssessmentSubmissionsListPage.tsx
  32. +131 −0 webapp/src/components/AssessmentSubmitBar.tsx
  33. +183 −0 webapp/src/components/AssessmentsListPage.tsx
  34. +468 −0 webapp/src/components/AssessmentsListTable.tsx
  35. +90 −0 webapp/src/components/AssessmentsListTabs.tsx
  36. +9 −0 webapp/src/components/Navbar.tsx
  37. +4 −4 webapp/src/helpers/__tests__/dateTime.ts
  38. +13 −0 webapp/src/helpers/useApiData.ts
  39. +102 −0 webapp/src/types/api.d.ts
  40. +1,345 −1,251 webapp/yarn.lock
2 changes: 1 addition & 1 deletion api/.nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v18.14
v18.16
1 change: 1 addition & 0 deletions api/.yarnrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
workspaces-experimental false
4 changes: 2 additions & 2 deletions api/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
FROM node:18.14-alpine AS build
FROM node:18.16-alpine AS build
WORKDIR /app/
COPY package.json yarn.lock ./
RUN yarn install --ignore-platform --frozen-lockfile --network-timeout 600000
COPY ./ ./
RUN yarn build

FROM node:18.14-alpine
FROM node:18.16-alpine
WORKDIR /app/
COPY --from=build /app/dist/ ./dist/
COPY --from=build /app/package.json /app/yarn.lock ./
47 changes: 23 additions & 24 deletions api/package.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"name": "@rhizone-lms/api",
"version": "0.0.0",
"version": "0.5.0",
"private": true,
"engines": {
"node": "^18.14.0",
"node": "^18.16.0",
"yarn": "^1.22.19"
},
"scripts": {
@@ -19,44 +19,43 @@
"test:watch": "jest --watchAll"
},
"dependencies": {
"connect-redis": "^6.0.0",
"connect-redis": "^7.1.0",
"cors": "^2.8.5",
"express": "^4.17.1",
"express-session": "^1.17.2",
"helmet": "^6.0.1",
"helmet": "^7.0.0",
"knex": "^2.4.2",
"luxon": "^3.2.1",
"mysql": "^2.18.1",
"redis": "^3.1.2",
"luxon": "^3.3.0",
"mysql2": "^3.3.1",
"redis": "^4.6.6",
"rollbar": "^2.26.1",
"socket.io": "^4.6.0",
"socket.io": "^4.6.1",
"superagent": "^8.0.9"
},
"devDependencies": {
"@types/connect-redis": "^0.0.19",
"@types/cors": "^2.8.13",
"@types/express": "^4.17.17",
"@types/express-session": "^1.17.4",
"@types/jest": "^29.4.0",
"@types/luxon": "^3.2.0",
"@types/mock-knex": "^0.4.3",
"@types/express-session": "^1.17.7",
"@types/jest": "^29.5.1",
"@types/luxon": "^3.3.0",
"@types/mock-knex": "^0.4.5",
"@types/mysql": "^2.15.19",
"@types/node": "^18.13.0",
"@types/superagent": "^4.1.13",
"@types/node": "^20.2.3",
"@types/superagent": "^4.1.17",
"@types/supertest": "^2.0.11",
"@typescript-eslint/eslint-plugin": "^5.51.0",
"@typescript-eslint/parser": "^5.51.0",
"@typescript-eslint/eslint-plugin": "^5.59.7",
"@typescript-eslint/parser": "^5.59.7",
"dotenv": "^16.0.3",
"eslint": "^8.33.0",
"eslint-config-prettier": "^8.6.0",
"jest": "^29.4.2",
"eslint": "^8.41.0",
"eslint-config-prettier": "^8.8.0",
"jest": "^29.5.0",
"mock-knex": "^0.4.12",
"nodemon": "^2.0.15",
"prettier": "^2.8.4",
"nodemon": "^2.0.22",
"prettier": "^2.8.8",
"supertest": "^6.3.3",
"ts-jest": "^29.0.5",
"ts-jest": "^29.1.0",
"ts-node": "^10.4.0",
"typescript": "^4.9.5"
"typescript": "^5.0.4"
},
"eslintConfig": {
"env": {
Loading