diff --git a/apps/client/index.html b/apps/client/index.html index db827cf..47910c1 100644 --- a/apps/client/index.html +++ b/apps/client/index.html @@ -5,8 +5,20 @@ Vite + React + TS + - +
diff --git a/apps/client/src/App.css b/apps/client/src/App.css index e69de29..39f1411 100644 --- a/apps/client/src/App.css +++ b/apps/client/src/App.css @@ -0,0 +1,3 @@ +:root { + --background-gradient: linear-gradient(315deg, #2b4162 0%, #12100e 74%); +} \ No newline at end of file diff --git a/apps/client/src/App.tsx b/apps/client/src/App.tsx index d3bf311..66baf80 100644 --- a/apps/client/src/App.tsx +++ b/apps/client/src/App.tsx @@ -2,11 +2,13 @@ import { BrowserRouter as Router, Routes, Route } from "react-router-dom";import import PostingQuestion from "./components/Posting"; import Landing from "./components/Landing"; import GetQuestion from "./components/GetQuestion"; +import NavBar from "./components/NavBar"; function App() { return ( <> + }> }> diff --git a/apps/client/src/assets/GitHub_logo.png b/apps/client/src/assets/GitHub_logo.png new file mode 100644 index 0000000..c61ab9d Binary files /dev/null and b/apps/client/src/assets/GitHub_logo.png differ diff --git a/apps/client/src/assets/github-mark.png b/apps/client/src/assets/github-mark.png new file mode 100644 index 0000000..50b8175 Binary files /dev/null and b/apps/client/src/assets/github-mark.png differ diff --git a/apps/client/src/components/GetQuestion.tsx b/apps/client/src/components/GetQuestion.tsx index f770ecb..9d167c9 100644 --- a/apps/client/src/components/GetQuestion.tsx +++ b/apps/client/src/components/GetQuestion.tsx @@ -30,10 +30,10 @@ export default function GetQuestion() { }; return ( -
-
+
+
{showPdf && ( )} + + + ); +} diff --git a/apps/client/tailwind.config.js b/apps/client/tailwind.config.js index 3278c6d..dd4274d 100644 --- a/apps/client/tailwind.config.js +++ b/apps/client/tailwind.config.js @@ -7,7 +7,14 @@ export default { './src/**/*.{html,ts}', ], theme: { - extend: {}, + extend: { + colors:{ + "box":"#2b4162" + }, + spacing: { + '35': '5.6rem', + }, + }, }, plugins: [], } diff --git a/package.json b/package.json index 0894940..3867e95 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "build": "turbo run build", "dev": "turbo run dev", "lint": "turbo run lint", - "start:express": "cd packages/prisma && sudo docker-compose up -d && node dist/index.js", + "start:express": "cd packages/prisma && yarn prisma migrate dev && yarn yarn prisma generate && sudo docker-compose up -d && node dist/index.js", "format": "prettier --write \"**/*.{ts,tsx,md}\"" }, "devDependencies": { diff --git a/packages/prisma/server/index.ts b/packages/prisma/server/index.ts index eb9950a..9650d12 100644 --- a/packages/prisma/server/index.ts +++ b/packages/prisma/server/index.ts @@ -96,7 +96,7 @@ app.get("/get/:testtype", async (req, res) => { const browser = await puppeteer.launch(); const page = await browser.newPage(); if (testType === "IA1") { - const skipNo = 3; + const skipNo = 4; const partA11Questions = await prisma.unit1.findMany({ skip: Math.floor(Math.random() * skipNo), select: { diff --git a/packages/ui/src/components/LandingPage.tsx b/packages/ui/src/components/LandingPage.tsx index 9f139d1..464cd91 100644 --- a/packages/ui/src/components/LandingPage.tsx +++ b/packages/ui/src/components/LandingPage.tsx @@ -1,7 +1,50 @@ +import { Link } from "react-router-dom"; +export function LandingPage() { + return ( +
+
+
+
+

Automatic Question Paper Generator

+
+
+

Upload the Question

+

Whenever needed, it will be automatically generated

+
+
+
-export function LandingPage(){ - return(<> - hi - ) -} \ No newline at end of file +
+

Info

+
+
+

Do you want to post Question?

+ + + +
+
+

Do you want to Get Question Paper?

+ + + +
+
+

Do you have any Queries?

+ + + +
+
+
+
+
+ ); +} diff --git a/packages/ui/src/components/Post.tsx b/packages/ui/src/components/Post.tsx index a9e9ef7..29e67d8 100644 --- a/packages/ui/src/components/Post.tsx +++ b/packages/ui/src/components/Post.tsx @@ -42,16 +42,16 @@ export function Post(props: { const [partc2co, setPartc2co] = useState("CO1"); return ( -
+
setParta1(e.target.value)} /> -
+
setParta2(e.target.value)} /> -
+
setPartb1(e.target.value)} /> -
+
setPartb2(e.target.value)} /> -
+
setPartc1(e.target.value)} /> -
+
setPartc2(e.target.value)} /> -
+