Commit 3f46dd44 authored by Ли Джен Сеп's avatar Ли Джен Сеп 💬

Merge branch 'validation' into 'master'

Validation

See merge request !14
parents 7b9451a2 38b0cdb6
POST http://localhost:8000/encode
POST http://localhost:8000/decode
...@@ -40,10 +40,7 @@ export default function InputField({ name, value, onChange }: Props) { ...@@ -40,10 +40,7 @@ export default function InputField({ name, value, onChange }: Props) {
</Typography> </Typography>
</Grid2> </Grid2>
<Grid2 <Grid2 size={name === "Password" ? 6 : 8} sx={{ "@media (max-width: 900px)": { width: "100%" } }}>
size={name === "Password" ? 6 : 8}
sx={{ "@media (max-width: 900px)": { width: "100%" } }}
>
<TextField <TextField
fullWidth fullWidth
multiline={name !== "Password"} multiline={name !== "Password"}
......
...@@ -57,11 +57,7 @@ export default function Home() { ...@@ -57,11 +57,7 @@ export default function Home() {
paddingY={2} paddingY={2}
> >
<Grid2 container direction="column" spacing={2}> <Grid2 container direction="column" spacing={2}>
<InputField <InputField name="Decoded" value={formData.decoded} onChange={onInputChangeHandler} />
name="Decoded"
value={formData.decoded}
onChange={onInputChangeHandler}
/>
<Grid2 <Grid2
container container
alignItems="center" alignItems="center"
...@@ -73,19 +69,11 @@ export default function Home() { ...@@ -73,19 +69,11 @@ export default function Home() {
}} }}
> >
<Grid2 size={7}> <Grid2 size={7}>
<InputField <InputField name="Password" value={formData.password} onChange={onInputChangeHandler} />
name="Password"
value={formData.password}
onChange={onInputChangeHandler}
/>
</Grid2> </Grid2>
<Grid2 container justifyContent={{}}> <Grid2 container justifyContent={{}}>
<Grid2> <Grid2>
<Button <Button size="small" variant="contained" startIcon={<ArrowDownwardIcon />}>
size="small"
variant="contained"
startIcon={<ArrowDownwardIcon />}
>
<Typography <Typography
sx={{ sx={{
display: { xs: "none", md: "inline" }, display: { xs: "none", md: "inline" },
...@@ -100,9 +88,7 @@ export default function Home() { ...@@ -100,9 +88,7 @@ export default function Home() {
<Button <Button
size="small" size="small"
variant="contained" variant="contained"
startIcon={ startIcon={<ArrowDownwardIcon sx={{ transform: "rotate(180deg)" }} />}
<ArrowDownwardIcon sx={{ transform: "rotate(180deg)" }} />
}
> >
<Typography <Typography
sx={{ sx={{
...@@ -116,11 +102,7 @@ export default function Home() { ...@@ -116,11 +102,7 @@ export default function Home() {
</Grid2> </Grid2>
</Grid2> </Grid2>
<InputField <InputField name="Encoded" value={formData.encoded} onChange={onInputChangeHandler} />
name="Encoded"
value={formData.encoded}
onChange={onInputChangeHandler}
/>
</Grid2> </Grid2>
</Box> </Box>
</Container> </Container>
......
{
"name": "homework83_m11",
"lockfileVersion": 3,
"requires": true,
"packages": {}
}
import { Test, TestingModule } from '@nestjs/testing';
import { AppController } from './app.controller';
import { AppService } from './app.service';
describe('AppController', () => {
let appController: AppController;
beforeEach(async () => {
const app: TestingModule = await Test.createTestingModule({
controllers: [AppController],
providers: [AppService],
}).compile();
appController = app.get<AppController>(AppController);
});
describe('root', () => {
it('should return "Hello World!"', () => {
expect(appController.getHello()).toBe('Hello World!');
});
});
});
import { Controller, Get } from '@nestjs/common';
import { AppService } from './app.service';
@Controller()
export class AppController {
constructor(private readonly appService: AppService) {}
@Get()
getHello(): string {
return this.appService.getHello();
}
}
import { Module } from '@nestjs/common';
import { AppController } from './app.controller';
import { AppService } from './app.service';
import { MessageModule } from './message/message.module';
@Module({
imports: [MessageModule],
controllers: [AppController],
providers: [AppService],
})
export class AppModule {}
import { Injectable } from '@nestjs/common';
@Injectable()
export class AppService {
getHello(): string {
return 'Hello World!';
}
}
import { NestFactory } from '@nestjs/core'; import { NestFactory } from '@nestjs/core';
import { AppModule } from './app.module';
import { ConfigModule } from '@nestjs/config'; import { ConfigModule } from '@nestjs/config';
import { MessageModule } from './message/message.module';
ConfigModule.forRoot(); ConfigModule.forRoot();
async function bootstrap() { async function startServer() {
const app = await NestFactory.create(AppModule); const app = await NestFactory.create(MessageModule);
await app.listen(process.env.PORT ?? 3000); await app.listen(8000);
} }
bootstrap(); startServer();
import { PartialType } from '@nestjs/mapped-types';
import { CreateMessageDto } from './create-message.dto';
export class UpdateMessageDto extends PartialType(CreateMessageDto) {}
import { Test, TestingModule } from '@nestjs/testing';
import { MessageController } from './message.controller';
import { MessageService } from './message.service';
describe('MessageController', () => {
let controller: MessageController;
beforeEach(async () => {
const module: TestingModule = await Test.createTestingModule({
controllers: [MessageController],
providers: [MessageService],
}).compile();
controller = module.get<MessageController>(MessageController);
});
it('should be defined', () => {
expect(controller).toBeDefined();
});
});
...@@ -6,7 +6,7 @@ import { CreateMessageDto } from './dto/create-message.dto'; ...@@ -6,7 +6,7 @@ import { CreateMessageDto } from './dto/create-message.dto';
export class MessageController { export class MessageController {
constructor(private readonly messageService: MessageService) {} constructor(private readonly messageService: MessageService) {}
@Post('encode') @Post('/encode')
encodeMessage(@Body() createMessageDto: CreateMessageDto): { encodeMessage(@Body() createMessageDto: CreateMessageDto): {
encoded: string; encoded: string;
} { } {
...@@ -15,7 +15,7 @@ export class MessageController { ...@@ -15,7 +15,7 @@ export class MessageController {
return { encoded }; return { encoded };
} }
@Post('decode') @Post('/decode')
decodeMessage(@Body() createMessageDto: CreateMessageDto): { decodeMessage(@Body() createMessageDto: CreateMessageDto): {
decoded: string; decoded: string;
} { } {
......
import { Test, TestingModule } from '@nestjs/testing';
import { MessageService } from './message.service';
describe('MessageService', () => {
let service: MessageService;
beforeEach(async () => {
const module: TestingModule = await Test.createTestingModule({
providers: [MessageService],
}).compile();
service = module.get<MessageService>(MessageService);
});
it('should be defined', () => {
expect(service).toBeDefined();
});
});
...@@ -4,10 +4,10 @@ import { Vigenere } from 'caesar-salad'; ...@@ -4,10 +4,10 @@ import { Vigenere } from 'caesar-salad';
@Injectable() @Injectable()
export class MessageService { export class MessageService {
encodeMessage(password: string, message: string): string { encodeMessage(password: string, message: string): string {
return Vigenere.Cipher(password).crypt(message); return Vigenere.Cipher(password.trim()).crypt(message);
} }
decodeMessage(password: string, message: string): string { decodeMessage(password: string, message: string): string {
return Vigenere.Decipher(password).crypt(message); return Vigenere.Decipher(password.trim()).crypt(message);
} }
} }
import { Test, TestingModule } from '@nestjs/testing';
import { INestApplication } from '@nestjs/common';
import * as request from 'supertest';
import { AppModule } from './../src/app.module';
describe('AppController (e2e)', () => {
let app: INestApplication;
beforeEach(async () => {
const moduleFixture: TestingModule = await Test.createTestingModule({
imports: [AppModule],
}).compile();
app = moduleFixture.createNestApplication();
await app.init();
});
it('/ (GET)', () => {
return request(app.getHttpServer())
.get('/')
.expect(200)
.expect('Hello World!');
});
});
{
"moduleFileExtensions": ["js", "json", "ts"],
"rootDir": ".",
"testEnvironment": "node",
"testRegex": ".e2e-spec.ts$",
"transform": {
"^.+\\.(t|j)s$": "ts-jest"
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment