graphite/Sharkey
1
0
Fork 0
mirror of https://git.joinsharkey.org/Sharkey/Sharkey.git synced 2024-11-23 01:33:08 +02:00
Code Issues Projects Releases Packages Wiki Activity

startAt -> startsAt

Browse source
This commit is contained in:
syuilo 2023-02-15 14:31:59 +09:00
parent 71c42bef9b
commit e24b0ceb80
6 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
packages/backend/migration/1676438468213-ad3.js
View file

@ -1,9 +1,9 @@
export class ad1676438468213 {
name = 'ad1676438468213';
async up(queryRunner) {
await queryRunner.query(`ALTER TABLE "ad" ADD "startAt" TIMESTAMP WITH TIME ZONE NOT NULL`);
await queryRunner.query(`ALTER TABLE "ad" ADD "startsAt" TIMESTAMP WITH TIME ZONE NOT NULL`);
}
async down(queryRunner) {
await queryRunner.query(`ALTER TABLE "role" DROP COLUMN "startAt"`);
await queryRunner.query(`ALTER TABLE "role" DROP COLUMN "startsAt"`);
}
}

2
packages/backend/src/models/entities/Ad.ts
View file

@ -22,7 +22,7 @@ export class Ad {
@Column('timestamp with time zone', {
comment: 'The expired date of the Ad.',
})
public startAt: Date;
public startsAt: Date;
@Column('varchar', {
length: 32, nullable: false,

6
packages/backend/src/server/api/endpoints/admin/ad/create.ts
View file

@ -20,10 +20,10 @@ export const paramDef = {
priority: { type: 'string' },
ratio: { type: 'integer' },
expiresAt: { type: 'integer' },
startAt: { type: 'integer' },
startsAt: { type: 'integer' },
imageUrl: { type: 'string', minLength: 1 },
},
required: ['url', 'memo', 'place', 'priority', 'ratio', 'expiresAt', 'startAt', 'imageUrl'],
required: ['url', 'memo', 'place', 'priority', 'ratio', 'expiresAt', 'startsAt', 'imageUrl'],
} as const;
// eslint-disable-next-line import/no-default-export
@ -40,7 +40,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
id: this.idService.genId(),
createdAt: new Date(),
expiresAt: new Date(ps.expiresAt),
startAt: new Date(ps.startAt),
startsAt: new Date(ps.startsAt),
url: ps.url,
imageUrl: ps.imageUrl,
priority: ps.priority,

6
packages/backend/src/server/api/endpoints/admin/ad/update.ts
View file

@ -30,9 +30,9 @@ export const paramDef = {
priority: { type: 'string' },
ratio: { type: 'integer' },
expiresAt: { type: 'integer' },
startAt: { type: 'integer' },
startsAt: { type: 'integer' },
},
required: ['id', 'memo', 'url', 'imageUrl', 'place', 'priority', 'ratio', 'expiresAt', 'startAt'],
required: ['id', 'memo', 'url', 'imageUrl', 'place', 'priority', 'ratio', 'expiresAt', 'startsAt'],
} as const;
// eslint-disable-next-line import/no-default-export
@ -55,7 +55,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
memo: ps.memo,
imageUrl: ps.imageUrl,
expiresAt: new Date(ps.expiresAt),
startAt: new Date(ps.startAt),
startsAt: new Date(ps.startsAt),
});
});
}

2
packages/backend/src/server/api/endpoints/meta.ts
View file

@ -262,7 +262,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
const ads = await this.adsRepository.find({
where: {
expiresAt: MoreThan(new Date()),
startAt: LessThanOrEqual(new Date()),
startsAt: LessThanOrEqual(new Date()),
},
});

12
packages/frontend/src/pages/admin/ads.vue
View file

@ -29,7 +29,7 @@
<MkInput v-model="ad.ratio" type="number">
<template #label>{{ i18n.ts.ratio }}</template>
</MkInput>
<MkInput v-model="ad.startAt" type="datetime-local">
<MkInput v-model="ad.startsAt" type="datetime-local">
<template #label>{{ i18n.ts.startingperiod }}</template>
</MkInput>
<MkInput v-model="ad.expiresAt" type="datetime-local">
@ -70,13 +70,13 @@ const localTimeDiff = localTime.getTimezoneOffset() * 60 * 1000;
os.api('admin/ad/list').then(adsResponse => {
ads = adsResponse.map(r => {
const exdate = new Date(r.expiresAt);
const stdate = new Date(r.startAt);
const stdate = new Date(r.startsAt);
exdate.setMilliseconds(exdate.getMilliseconds() - localTimeDiff);
stdate.setMilliseconds(stdate.getMilliseconds() - localTimeDiff);
return {
...r,
expiresAt: exdate.toISOString().slice(0, 16),
startAt: stdate.toISOString().slice(0, 16),
startsAt: stdate.toISOString().slice(0, 16),
};
});
});
@ -91,7 +91,7 @@ function add() {
url: '',
imageUrl: null,
expiresAt: null,
startAt: null,
startsAt: null,
});
}
@ -113,13 +113,13 @@ function save(ad) {
os.apiWithDialog('admin/ad/create', {
...ad,
expiresAt: new Date(ad.expiresAt).getTime(),
startAt: new Date(ad.startAt).getTime(),
startsAt: new Date(ad.startsAt).getTime(),
});
} else {
os.apiWithDialog('admin/ad/update', {
...ad,
expiresAt: new Date(ad.expiresAt).getTime(),
startAt: new Date(ad.startAt).getTime(),
startsAt: new Date(ad.startsAt).getTime(),
});
}
}