Skip to content

Commit

Permalink
Merge pull request #119 from tsg-iitkgp/certifpreview
Browse files Browse the repository at this point in the history
Certifpreview
  • Loading branch information
ParthGupta2510 authored Apr 15, 2024
2 parents 820badc + 1a9edbc commit 5bd2e7e
Show file tree
Hide file tree
Showing 43 changed files with 44,911 additions and 43 deletions.
42,463 changes: 42,463 additions & 0 deletions package-lock.json

Large diffs are not rendered by default.

13 changes: 11 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,10 @@
"private": true,
"dependencies": {
"@fortawesome/fontawesome-svg-core": "^1.2.36",
"@fortawesome/free-brands-svg-icons": "^6.4.2",
"@fortawesome/free-regular-svg-icons": "^6.4.2",
"@fortawesome/free-solid-svg-icons": "^5.15.4",
"@fortawesome/react-fontawesome": "^0.1.15",
"@fortawesome/react-fontawesome": "^0.2.0",
"@material-ui/core": "^4.12.3",
"@material-ui/icons": "^4.11.2",
"@nivo/bar": "^0.74.1",
Expand All @@ -15,22 +17,29 @@
"axios": "^0.21.1",
"bootstrap": "^5.2.0",
"caniuse-lite": "^1.0.30001506",
"html2canvas": "^1.4.1",
"jsonwebtoken": "^8.5.1",
"jspdf": "^2.5.1",
"popper.js": "^1.16.1",
"react": "^17.0.2",
"react-awesome-slider": "^4.1.0",
"react-bootstrap": "^2.5.0",
"react-bootstrap-icons": "^1.6.1",
"react-canvas-confetti": "^1.4.0",
"react-carousel-minimal": "^1.4.1",
"react-confetti": "^6.1.0",
"react-copy-to-clipboard": "^5.1.0",
"react-dom": "^17.0.2",
"react-faq-component": "^1.3.1",
"react-feather": "^2.0.9",
"react-icons": "^4.2.0",
"react-image-gallery": "^1.2.7",
"react-image-size": "^2.0.2",
"react-modal": "^3.14.4",
"react-router-dom": "^5.2.0",
"react-scripts": "^4.0.3"
"react-scripts": "^4.0.3",
"react-use": "^17.4.0",
"reactstrap": "^9.2.0"
},
"scripts": {
"start": "react-scripts --openssl-legacy-provider start",
Expand Down
Binary file added public/data/media/images/adminphotos/Generate.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
17 changes: 17 additions & 0 deletions src/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,14 @@ import ElectionCandidates from "./pages/Elections/ElectionCandidates";
import CertifGen from "./pages/admin/CertificateGenerator/CertifGen";
import EventsUpdatePage from "./pages/admin/DataUpdate/EventsUpdatePage";
import Nominations from "./pages/Nominations/Nominations";
import CertifGen2 from "./pages/newadmin/certifgen2/CertifGen2";
import CertifGenerate from "./pages/newadmin/certifgen2/CertifGenerate";
import NewLogin from "./pages/newadmin/NewLogin";
import ExistingTemplates from "./pages/newadmin/certifgen2/ExistingTemplates";
import UploadTemplates from "./pages/newadmin/certifgen2/UploadInterface";
import Canvas from "./pages/newadmin/certifgen2/Canvas";
import ViewLog from "./pages/newadmin/certifgen2/ViewLog";
import CertifPreview from "./pages/CertifPreview";
import LiveScoreboard from "./pages/LiveScoreboard/LiveScoreboard";
import Results from "./pages/Results/Results";

Expand All @@ -43,6 +51,15 @@ function App() {
<Route exact path="/login" component={Login} />
<PrivateRoute exact path="/admin" component={Dashboard} />
<PrivateRoute exact path="/admin/certificate" component={CertifGen} />
<PrivateRoute exact path="/admin/events" component={EventsUpdatePage} />
<Route exact path ="/newadmin/certifgen2" component = {CertifGen2}/>
<Route exact path ="/newadmin/certifgen2/certifgenerate" component = {CertifGenerate}/>
<Route exact path ="/newadmin/login" component = {NewLogin} />
<Route exact path = "/newadmin/certifgen2/existingtemplates" component={ExistingTemplates} />
<Route exact path ="/newadmin/certifgen2/uploadtemplate" component = {UploadTemplates}/>
<Route exact path ="/newadmin/certifgen2/uploadtemplate/canvas" component = {Canvas}/>
<Route exact path = "/newadmin/certifgen2/viewlogs" component = {ViewLog} />
<Route exact path="/certifgen/view/:certifid" component={CertifPreview} />
<PrivateRoute
exact
path="/admin/events"
Expand Down
13 changes: 13 additions & 0 deletions src/components/AdminLayout.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
import React from 'react';
import AdminNavbar from "./AdminNavbar/AdminNavbar";

export default function AdminLayout({ children }) {
return (
<div className="adminlayout">
<AdminNavbar />
<main style={{ margin:"3vw auto" ,
padding:" 0vw 0vw 5vw 0vw", width:"85vw",
minHeight:"80vh" ,backgroundColor:"white", borderRadius:"0.75vw", boxShadow: "rgba(100, 100, 111, 0.2) 0px 7px 29px 0px" }}>{children}</main>
</div>
);
}
9 changes: 9 additions & 0 deletions src/components/AdminNavbar/AdminNavbar.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
import React from 'react';

export default function AdminNavbar(){
return(
<div>
<h1>NAVBAR HERE</h1>
</div>
)
}
109 changes: 109 additions & 0 deletions src/components/NewAdmin/CoordinateMapping.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,109 @@
@media only screen and (min-width: 1800px){
.CoordinateMappingDiv {
width: 100%;
margin: 3vw 0;
display: flex;
/* justify-content: space-between; */
}

.TableDiv > table{
width: 40vw;
margin: 20px auto;
}

.InputDiv {
display: flex;
justify-content: space-between;
align-items: center;
width: 40vw;
margin: 0 auto;
}
}

@media only screen and (max-width:1801px){
.CoordinateMappingDiv {
margin: 1vw 0;
width: 100%;
display: flex;
flex-direction: column;
align-items: center;
/* justify-content: space-between; */
}

.TableDiv > table{
width: 70vw;
margin: 20px auto;
}

.InputDiv {
display: flex;
justify-content: space-between;
align-items: center;
width: 70vw;
margin: 0 auto;
}
}



.CanvasDiv {
/* display: flex; */
/* justify-content: center; */
/* align-items: center; */
/* height: 95vh; */
}

.RectDiv {
width: 85vw;
}

.InputDiv input{
width:16vw;
}

.InputDiv label{
font-size: 20px;
font-weight: 500;
}

.Form > input{
font-size: 20px;
margin: 0 5px;
}

.InputDiv>* {
margin: .3rem ;
font-size: 20px;
padding: 5px 15px;
}

.InputDiv button{
cursor: pointer;
}


#myCanvas {
/* width: 40vw; */
/* height: 60%; */
background-color: black;
/* background-image: url("../public/imgs/certi.png"); */
background-size: contain;
background-repeat: no-repeat;
}

.sideBar {
width: 50%;
}

.TableDiv th{
background-color: #5da9ff;
color: white;
padding: 10px;
font-size: 25px;
}

.TableDiv td{
background-color: white;
padding: 5px;
font-size: 20px;
}
Loading

0 comments on commit 5bd2e7e

Please sign in to comment.