matty/ncd-fe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update code to deal with new paths under src

Browse Source
This commit is contained in:
Alex Gleason
2023-09-18 16:37:15 -05:00
parent efdec35d98
commit dd97a46a03
21 changed files with 69 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/normalizers/__tests__/account.test.ts
View File

@ -2,8 +2,8 @@ import { Record as ImmutableRecord, fromJS } from 'immutable';
import { normalizeAccount } from '../account';
const AVATAR_MISSING = require('assets/images/avatar-missing.png');
const HEADER_MISSING = require('assets/images/header-missing.png');
const AVATAR_MISSING = require('soapbox/assets/images/avatar-missing.png');
const HEADER_MISSING = require('soapbox/assets/images/header-missing.png');
describe('normalizeAccount()', () => {
it('adds base fields', () => {

4
src/normalizers/account.ts
View File

@ -100,7 +100,7 @@ const normalizePleromaLegacyFields = (account: ImmutableMap<string, any>) => {
const normalizeAvatar = (account: ImmutableMap<string, any>) => {
const avatar = account.get('avatar');
const avatarStatic = account.get('avatar_static');
const missing = require('assets/images/avatar-missing.png');
const missing = require('soapbox/assets/images/avatar-missing.png');
return account.withMutations(account => {
account.set('avatar', avatar || avatarStatic || missing);
@ -112,7 +112,7 @@ const normalizeAvatar = (account: ImmutableMap<string, any>) => {
const normalizeHeader = (account: ImmutableMap<string, any>) => {
const header = account.get('header');
const headerStatic = account.get('header_static');
const missing = require('assets/images/header-missing.png');
const missing = require('soapbox/assets/images/header-missing.png');
return account.withMutations(account => {
account.set('header', header || headerStatic || missing);

4
src/normalizers/group.ts
View File

@ -53,7 +53,7 @@ export const GroupRecord = ImmutableRecord({
const normalizeAvatar = (group: ImmutableMap<string, any>) => {
const avatar = group.get('avatar');
const avatarStatic = group.get('avatar_static');
const missing = require('assets/images/avatar-missing.png');
const missing = require('soapbox/assets/images/avatar-missing.png');
return group.withMutations(group => {
group.set('avatar', avatar || avatarStatic || missing);
@ -65,7 +65,7 @@ const normalizeAvatar = (group: ImmutableMap<string, any>) => {
const normalizeHeader = (group: ImmutableMap<string, any>) => {
const header = group.get('header');
const headerStatic = group.get('header_static');
const missing = require('assets/images/header-missing.png');
const missing = require('soapbox/assets/images/header-missing.png');
return group.withMutations(group => {
group.set('header', header || headerStatic || missing);