Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
41ba3da
update package json to latest payload package version and additional …
goblincore Apr 30, 2024
0bf44f6
Update payload config
goblincore Apr 30, 2024
6bb1b43
update server ts
goblincore Apr 30, 2024
6406913
Add payload script to package jscon
goblincore Apr 30, 2024
50cb9e5
Add generated migration script
goblincore Apr 30, 2024
1aee3a8
Fix getCollectionCount mongo query
goblincore Apr 30, 2024
bb9189e
Fix undefined fieldTypes in Createbatch
goblincore Apr 30, 2024
607b561
Fix credentials page not rendering
goblincore Apr 30, 2024
d3bfd2c
Fix import in HorizontalNavFooter
goblincore Apr 30, 2024
b431286
Fix missing fieldTypes in CreateTemplate
goblincore Apr 30, 2024
590cf3c
Fix fieldTypes undefined issue in additional collection components
goblincore Apr 30, 2024
eaabd32
Fix fieldTypes for email template and membership template
goblincore Apr 30, 2024
0172e7a
Fix AccountSettings errors
goblincore Apr 30, 2024
57210ee
temp fix wip for sending status update batch issue
goblincore Apr 30, 2024
af78b18
Add better error handling in sendBatchEmail and add transaction support
goblincore Apr 30, 2024
0217904
Fix list view when 0 items in collection
Custard7 May 1, 2024
9a1cc97
comment out transaction logic for now
goblincore May 1, 2024
532ea44
Update sanity checks
Custard7 May 1, 2024
0f2fef0
Merge branch 'payload-2.0' of github.com:learningeconomy/admin-dashbo…
Custard7 May 1, 2024
b055776
sanity check
Custard7 May 1, 2024
a998b27
:lipstick: Fix scrolling
TaylorBeeston May 6, 2024
7499f3a
:bug: Fix modals not working
TaylorBeeston May 6, 2024
7838bc1
sidebar scroll fix, hide some elements
goblincore May 9, 2024
d340d77
Hide app header for now
goblincore May 9, 2024
3d8431d
Fix checkmark styles
goblincore May 10, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6,974 changes: 4,169 additions & 2,805 deletions pnpm-lock.yaml

Large diffs are not rendered by default.

23 changes: 10 additions & 13 deletions services/payload/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,23 +12,18 @@
"serve": "cross-env PAYLOAD_CONFIG_PATH=dist/payload.config.js NODE_ENV=production node dist/server.js",
"copyfiles": "copyfiles -u 1 \"src/**/*.{html,css,scss,ttf,woff,woff2,eot,svg,jpg,png}\" dist/",
"generate:types": "cross-env PAYLOAD_CONFIG_PATH=src/payload.config.ts payload generate:types",
"generate:graphQLSchema": "cross-env PAYLOAD_CONFIG_PATH=src/payload.config.ts payload generate:graphQLSchema"
},
"pnpm": {
"supportedArchitectures": {
"libc": [
"musl"
]
},
"overrides": {
"sharp": "0.33.3"
}
"generate:graphQLSchema": "cross-env PAYLOAD_CONFIG_PATH=src/payload.config.ts payload generate:graphQLSchema",
"payload": "cross-env PAYLOAD_CONFIG_PATH=src/payload.config.ts payload"
},
"dependencies": {
"@faceless-ui/modal": "^2.0.1",
"@faceless-ui/modal": "2.0.1",
"@faceless-ui/window-info": "^2.1.1",
"@learncard/didkit-plugin": "^1.4.3",
"@learncard/init": "^1.2.15",
"@payloadcms/bundler-webpack": "^1.0.6",
"@payloadcms/db-mongodb": "^1.5.1",
"@payloadcms/plugin-cloud": "^3.0.0",
"@payloadcms/richtext-slate": "^1.5.1",
"@radix-ui/react-accordion": "^1.1.2",
"better-error-message-for-json-parse": "^0.1.6",
"bullmq": "^4.9.0",
Expand All @@ -46,14 +41,16 @@
"lucide-react": "^0.279.0",
"md5": "^2.3.0",
"object-to-formdata": "^4.5.1",
"optional": "^0.1.4",
"papaparse": "^5.4.1",
"payload": "1.13.4",
"payload": "2.14.2",
"qs": "^6.11.2",
"react": "^18.2.0",
"react-flip-toolkit": "^7.1.0",
"react-i18next": "^13.2.2",
"react-router-dom": "^5.3.4",
"react-toastify": "^9.1.3",
"sharp": "^0.32.6",
"tailwind-merge": "^1.14.0",
"tailwindcss-animate": "^1.0.7",
"uuid": "^9.0.1",
Expand Down
8 changes: 4 additions & 4 deletions services/payload/src/components/AccountSettings.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,11 @@ import RenderTitle from 'payload/dist/admin/components/elements/RenderTitle';
import ReactSelect from 'payload/dist/admin/components/elements/ReactSelect';
import RenderFields from 'payload/dist/admin/components/forms/RenderFields';
import Label from 'payload/dist/admin/components/forms/Label';
import LeaveWithoutSaving from 'payload/dist/admin/components/modals/LeaveWithoutSaving';
import { LeaveWithoutSaving } from 'payload/dist/admin/components/modals/LeaveWithoutSaving';
import { Save } from 'payload/dist/admin/components/elements/Save';
import { ToggleTheme } from 'payload/dist/admin/components/views/Account/ToggleTheme';
import { Gutter } from 'payload/dist/admin/components/elements/Gutter';
import { useAuth } from 'payload/components/utilities';
import fieldTypes from 'payload/dist/admin/components/forms/field-types';
import getI18n from 'payload/dist/translations/init';

import type { Translation } from 'payload/dist/translations/type';
Expand All @@ -29,6 +28,7 @@ const AccountSettings: React.FC<Props> = ({
hasSavePermission,
initialState,
isLoading,
fieldTypes,
action,
onSave: onSaveFromProps,
}) => {
Expand All @@ -39,8 +39,8 @@ const AccountSettings: React.FC<Props> = ({
} = collection;

const { refreshCookieAsync } = useAuth();
const i18n = getI18n({}) as any;
const { t } = useTranslation('authentication', { i18n });
const { i18n, t } = useTranslation('authentication')


const languageOptions = Object.entries(i18n?.options?.resources ?? {}).map(
([language, resource]) => ({
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,11 @@ const BatchCredentialListPreview: React.FC<BatchCredentialListPreviewProps> = ({
if (!data) return <></>;

const {
breakpoints: { s: smallBreak },
breakpoints
} = useWindowInfo();

const smallBreak = breakpoints?.s;

const { t, i18n } = useTranslation('general');
let formattedDocs = data.docs || [];

Expand Down
Loading