diff --git a/package.json b/package.json index a917c8d..dbbad98 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "void", - "version": "0.2.2", + "version": "0.2.3", "private": true, "engines": { "node": ">=14" diff --git a/prisma/migrations/20211002062936_url_password/migration.sql b/prisma/migrations/20211002062936_url_password/migration.sql new file mode 100644 index 0000000..3ab99b4 --- /dev/null +++ b/prisma/migrations/20211002062936_url_password/migration.sql @@ -0,0 +1,2 @@ +-- AlterTable +ALTER TABLE "Url" ADD COLUMN "password" TEXT; diff --git a/prisma/schema.prisma b/prisma/schema.prisma index 1bac1d2..6307f9c 100644 --- a/prisma/schema.prisma +++ b/prisma/schema.prisma @@ -27,6 +27,7 @@ model Url { destination String short String createdAt DateTime @default(now()) + password String? views Int @default(0) user User @relation(fields: [userId], references: [id]) userId Int diff --git a/server/index.js b/server/index.js index 1d9ba2d..a38f32f 100644 --- a/server/index.js +++ b/server/index.js @@ -19,7 +19,7 @@ const dev = process.env.NODE_ENV === 'development'; try { const config = await validateConfig(configReader()); const data = await prismaRun(config.core.database_url, ['migrate', 'status'], true); - if (data.includes('Following migration have not yet been applied')) { + if (data.match(/Following migration[s]? have not yet been applied/)) { info('DB', 'Some migrations are not applied, applying them now...'); await deployDb(config); info('DB', 'Finished applying migrations'); diff --git a/src/components/pages/Upload.tsx b/src/components/pages/Upload.tsx index 83f79f8..8343045 100644 --- a/src/components/pages/Upload.tsx +++ b/src/components/pages/Upload.tsx @@ -1,4 +1,4 @@ -import { Button, Center, Checkbox, Heading, HStack, Select, Text, useColorModeValue, useToast, VStack } from '@chakra-ui/react'; +import { Button, Center, Checkbox, Heading, HStack, Select, Input, Text, useColorModeValue, useToast, VStack } from '@chakra-ui/react'; import copy from 'copy-to-clipboard'; import { useStoreSelector } from 'lib/redux/store'; import React, { useState } from 'react'; @@ -51,25 +51,22 @@ export default function Upload() { setBusy(false); } }; - const fg = useColorModeValue('gray.800', 'white'); - const bg = useColorModeValue('gray.100', 'gray.700'); - const shadow = useColorModeValue('outline', 'dark-lg'); return (