Skip to content

Commit

Permalink
Merge branch 'main' into prod
Browse files Browse the repository at this point in the history
  • Loading branch information
samyak-jain-12 committed Sep 28, 2024
2 parents 6fe9bed + 0052f7d commit e15f80e
Show file tree
Hide file tree
Showing 22 changed files with 1,179 additions and 61 deletions.
40 changes: 40 additions & 0 deletions app/events/events.module.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,43 @@
.scrollbar {
position: relative;
height: 35%;
width: 3px;
z-index: 1;
left: 98.5vw;
margin-top: 50px;
bottom: -15vh;
.rect {
position: absolute;
height: 100%;
width: 100%;
background-color: white;
}
.rightrect{
position: absolute;
height: 100%;
width: 100%;
background-color: white;
right: 19px;
}
.topicon {
position: absolute;
top: -9px;
right: 4px;
transform: scale(1.2);
}
.bottomicon {
position: absolute;
bottom: -9px;
right: 4px;
transform: scale(1.2) rotateZ(180deg);
}
.mainicon {
position: absolute;
right: 6.5px;
top: 4px;
}
}

.heading {
width: 100%;
margin-top: 2rem;
Expand Down
3 changes: 2 additions & 1 deletion app/events/page.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
"use client";

import React, { useState } from "react";
import React, { useState, useRef } from "react";
import styles from "./events.module.scss";
import Folder from "@/components/Events/Folder/Folder";
import Category from "@/components/Events/Category/Category";
Expand Down Expand Up @@ -37,6 +37,7 @@ export default function EventsPage() {
<div className={styles.heading}>
<h2>EVENTS</h2>
</div>

{/* <div className={styles.folderContainer}>
<Folder
folderIcon={dance}
Expand Down
4 changes: 2 additions & 2 deletions app/landing.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
left: 20px;
z-index: 5200;

@media (width >= 1920px) {
@media (width > 1920px) {
top: 60px;
left: 60px;
}
Expand All @@ -56,6 +56,6 @@
z-index: 5000;

@media (width > 1920px) {
transform: translateY(-50%) scale(1.4) translateX(-8%)!important;
transform: translateY(-50%) scale(1.4) translateX(-8%) !important;
}
}
2 changes: 2 additions & 0 deletions app/layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ export const metadata: Metadata = {
},
},
openGraph: {
type: "website",
url: "https://www.bits-oasis.org",
title: "Oasis '24",
description:
Expand Down Expand Up @@ -55,6 +56,7 @@ export default function RootLayout({
return (
<html lang="en">
<head>
<title>Oasis &apos;24</title>
<meta
name="google-site-verification"
content="GKxgBVi8dPgOPEBsP-lgb_ZM201NN8NE5ZbVEhrhpDw"
Expand Down
72 changes: 72 additions & 0 deletions app/pdf/page.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
// "use client";

// import { useState, useCallback, useEffect } from "react";

// import { pdfjs, Document, Page } from "react-pdf";
// import "react-pdf/dist/esm/Page/AnnotationLayer.css";
// import "react-pdf/dist/esm/Page/TextLayer.css";

// import "./pdf.css";

// pdfjs.GlobalWorkerOptions.workerSrc = `//unpkg.com/pdfjs-dist@${pdfjs.version}/legacy/build/pdf.worker.min.mjs`;
// // pdfjs.GlobalWorkerOptions.workerSrc = `//unpkg.com/pdfjs-dist@${pdfjs.version}/build/pdf.worker.min.mjs`;
// // pdfjs.GlobalWorkerOptions.workerSrc = `https://cdnjs.cloudflare.com/ajax/libs/pdf.js/${pdfjs.version}/pdf.worker.min.mjs`;


// type PDFFile = string | File | null;

// export default function PDF() {
// const [file, setFile] = useState<PDFFile>("./sample.pdf");
// const [numPages, setNumPages] = useState<number>();
// const [isClient, setIsClient] = useState(false);

// const onDocumentLoadSuccess = useCallback(
// ({ numPages }: { numPages: number }) => {
// setNumPages(numPages);
// },
// []
// );

// useEffect(() => {
// setIsClient(true);
// }, []);

// if (!isClient) {
// return null;
// }

// return (
// <div className="Example">
// <div className="Example__container">
// <div className="Example__container__document">
// <Document
// file={file}
// loading={"Please wait i am loading"}
// onLoadSuccess={onDocumentLoadSuccess}
// onLoadError={(error) => console.log(error)}
// >
// {Array.from(new Array(numPages), (_el, index) => (
// <Page
// key={`page_${index + 1}`}
// pageNumber={index + 1}
// renderTextLayer={false}
// // renderInteractiveForms={false}
// />
// ))}
// </Document>
// </div>
// </div>
// </div>
// );
// }

import React from "react";

export default function Pdf() {

return(
<div>pdf</div>
)
}


64 changes: 64 additions & 0 deletions app/pdf/pdf.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
body {
margin: 0;
padding: 0;
background-color: #190d2c;
}

.Example__container {
display: flex;
flex-direction: column;
align-items: center;
margin: 0;
padding: 0;
}

.Example__container__load {
margin-top: 1em;
color: white;
}

.Example__container__document {
width: 55vw;
max-width: calc(100% - 2em);
margin: 0em 0;
height: 80vh;
overflow-y: scroll;
}

.Example__container .react-pdf__Page__canvas {
width: 100%;
height: 100%;
}

.Example__container__document .react-pdf__Document {
display: flex;
flex-direction: column;
align-items: center;
}

.Example__container__document .react-pdf__Page {
margin: 0.2em 0;
box-shadow: 0 0 8px rgba(0, 0, 0, 0.5);
}

.Example__container__document .react-pdf__message {
padding: 20px;
color: white;
}

.view {
height: 70vh;
width: 80vw;
overflow: hidden;
background-color: white !important;
margin: 0;
padding: 0;
border: none;
}

@media (max-width: 500px) {
.view {
height: 70vw;
width: 50vw;
}
}
Loading

0 comments on commit e15f80e

Please sign in to comment.