Release 1.0.6 #4

Merged
mifi merged 12 commits from develop into main 2023-05-26 21:49:26 +00:00
3 changed files with 9 additions and 0 deletions
Showing only changes of commit d97a7d7f95 - Show all commits

View File

@@ -1,6 +1,7 @@
.build.yarnrc.yml .build.yarnrc.yml
.drone.yml .drone.yml
.eslintrc* .eslintrc*
.npmrc
.prettierrc* .prettierrc*
.yarnrc.yml .yarnrc.yml
babel.config.* babel.config.*

View File

@@ -1,5 +1,9 @@
import { Types } from 'mongoose'; import { Types } from 'mongoose';
<<<<<<<< HEAD:src/dao/auth/readOneByRecord.ts
import { Auth } from '../../model/auth'; import { Auth } from '../../model/auth';
========
import { Auth } from '../model/auth';
>>>>>>>> main:src/dao/readOneByRecord.ts
export const readOneByRecord = async (record: Types.ObjectId) => Auth.findOne({ record }); export const readOneByRecord = async (record: Types.ObjectId) => Auth.findOne({ record });

View File

@@ -1,3 +1,7 @@
<<<<<<<< HEAD:src/dao/auth/readOneByUsername.ts
import { Auth } from '../../model/auth'; import { Auth } from '../../model/auth';
========
import { Auth } from '../model/auth';
>>>>>>>> main:src/dao/readOneByUsername.ts
export const readOneByUsername = async (username: string) => Auth.findOne({ username }); export const readOneByUsername = async (username: string) => Auth.findOne({ username });