Skip to content

Commit

Permalink
Merge branch 'dev-sanjay' of github.com:sanjaybaskaran01/Evie-fronten…
Browse files Browse the repository at this point in the history 
…d into dev-sanjay
  • Loading branch information
@sanjaybaskaran01
sanjaybaskaran01 committed Sep 6, 2021
2 parents 681a394 + 6f11ea2 commit dd494c3
Show file tree
Hide file tree
Showing 2 changed files with 37 additions and 36 deletions.
70 changes: 34 additions & 36 deletions src/pages/admin/index.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,32 +84,24 @@ const Admin = () => {
</div>
</div>
</div>
<div className="flex flex-row text-gray-400">
<div className="flex inline-flex items-center">
<path d="M8 9a3 3 0 100-6 3 3 0 000 6zM8 11a6 6 0 016 6H2a6 6 0 016-6zM16 7a1 1 0 10-2 0v1h-1a1 1 0 100 2h1v1a1 1 0 102 0v-1h1a1 1 0 100-2h-1V7z"></path>
<p className="">Coordinator: {event.cname}</p>
</div>
</div>
<div className="flex flex-col text-sm text-gray-400">
<div className="flex-1 inline-flex items-center">
<svg
xmlns="http://www.w3.org/2000/svg"
className="h-5 w-5 mr-2"
viewBox="0 0 20 20"
fill="currentColor"
>
<path d="M8 9a3 3 0 100-6 3 3 0 000 6zM8 11a6 6 0 016 6H2a6 6 0 016-6zM16 7a1 1 0 10-2 0v1h-1a1 1 0 100 2h1v1a1 1 0 102 0v-1h1a1 1 0 100-2h-1V7z"></path>
</svg>
<p className="">{event.email}</p>
</div>
<div className="flex flex-row text-gray-400 mt-2">
<div className="flex inline-flex items-center">
Label Color:&nbsp; &nbsp; <div className="labelColor" style={{width:"20px",height:"20px",backgroundColor:event.backgroundColor, borderRadius:"50%", border: "1px solid #fff"}}></div>
&nbsp; &nbsp;Text Color:&nbsp; &nbsp; <div className="labelColor" style={{width:"20px",height:"20px",backgroundColor:event.textColor, borderRadius:"50%", border: "1px solid #fff"}}></div>
</div>
</div>
<div className="flex flex-row mt-2">
<div className="flex-1 inline-flex items-center">
<svg
xmlns="http://www.w3.org/2000/svg"
className="h-5 w-5 mr-2"
viewBox="0 0 20 20"
fill="currentColor"
>
<path
fillRule="evenodd"
d="M12.395 2.553a1 1 0 00-1.45-.385c-.345.23-.614.558-.822.88-.214.33-.403.713-.57 1.116-.334.804-.614 1.768-.84 2.734a31.365 31.365 0 00-.613 3.58 2.64 2.64 0 01-.945-1.067c-.328-.68-.398-1.534-.398-2.654A1 1 0 005.05 6.05 6.981 6.981 0 003 11a7 7 0 1011.95-4.95c-.592-.591-.98-.985-1.348-1.467-.363-.476-.724-1.063-1.207-2.03zM12.12 15.12A3 3 0 017 13s.879.5 2.5.5c0-1 .5-4 1.25-4.5.5 1 .786 1.293 1.371 1.879A2.99 2.99 0 0113 13a2.99 2.99 0 01-.879 2.121z"
clipRule="evenodd"
></path>
</svg>
<input
className="shadow appearance-none border rounded w-full py-2 px-3 text-gray-700 leading-tight focus:outline-none focus:shadow-outline"
type="text"
Expand All @@ -119,15 +111,15 @@ const Admin = () => {
</div>
<a
href={event.url}
className="flex-no-shrink bg-blue-400 hover:bg-blue-500 px-3 ml-4 py-1 text-xs shadow-sm hover:shadow-lg font-medium tracking-wider border-2 border-blue-300 hover:border-indigo-800 text-white rounded-full transition ease-in duration-300"
className="mod-btn flex-no-shrink bg-blue-400 hover:bg-blue-500 px-3 ml-4 py-1 text-xs shadow-sm hover:shadow-lg font-medium tracking-wider border-2 border-blue-300 hover:border-indigo-800 text-white rounded-full transition ease-in duration-300"
target="_blank"
rel="noreferrer"
>
<b> → </b>
</a>
<a
href={`#/`}
className="flex-no-shrink bg-green-400 hover:bg-green-500 px-3 ml-4 py-1 text-xs shadow-sm hover:shadow-lg font-medium tracking-wider border-2 border-green-300 hover:border-green-500 text-white rounded-full transition ease-in duration-300"
className="mod-btn flex-no-shrink bg-green-400 hover:bg-green-500 px-3 ml-4 py-1 text-xs shadow-sm hover:shadow-lg font-medium tracking-wider border-2 border-green-300 hover:border-green-500 text-white rounded-full transition ease-in duration-300"
onClick={async ()=>{
await approveEvent(event._id)
window.location.reload()}}
Expand All @@ -136,7 +128,7 @@ const Admin = () => {
</a>
<a
href={`#/`}
className="flex-no-shrink bg-red-400 hover:bg-red-500 px-3 ml-4 py-1 text-xs shadow-sm hover:shadow-lg font-medium tracking-wider border-2 border-red-300 hover:border-red-500 text-white rounded-full transition ease-in duration-300"
className="mod-btn flex-no-shrink bg-red-400 hover:bg-red-500 px-3 ml-4 py-1 text-xs shadow-sm hover:shadow-lg font-medium tracking-wider border-2 border-red-300 hover:border-red-500 text-white rounded-full transition ease-in duration-300"
onClick={async ()=>{
await denyEvent(event._id,reason)
window.location.reload()
Expand Down Expand Up @@ -191,8 +183,9 @@ const Admin = () => {
<div className="w-full">
<div className="flex flex-col">
<div className="border border-green-500 shadow-lg rounded-3xl p-4 m-4">
<div className="flex flex-row justify-between">
<div className="flex-none sm:flex">
<div className=" relative sm:mb-0 mb-3">
<div className="flex flex-row justify-between sm:mb-0 mb-3">
<img
src={event.img}
alt={event.org}
Expand All @@ -218,19 +211,27 @@ const Admin = () => {
</div>
<div className="flex flex-row text-gray-400">
<div className="flex inline-flex items-center">
<svg
xmlns="http://www.w3.org/2000/svg"
className="h-5 w-5 mr-2"
viewBox="0 0 20 20"
fill="currentColor"
>
<path d="M8 9a3 3 0 100-6 3 3 0 000 6zM8 11a6 6 0 016 6H2a6 6 0 016-6zM16 7a1 1 0 10-2 0v1h-1a1 1 0 100 2h1v1a1 1 0 102 0v-1h1a1 1 0 100-2h-1V7z"></path>
</svg>
<p className="">Coordinator: {event.cname}</p>
</div>
</div>
<div className="flex flex-row text-gray-400">
<div className="flex inline-flex items-center">
<p className="">{event.email}</p>
<a
</div>
</div>
<div className="flex flex-row text-gray-400">
<div className="flex inline-flex items-center">
Label Color:&nbsp; &nbsp; <div className="labelColor" style={{width:"20px",height:"20px",backgroundColor:event.backgroundColor, borderRadius:"50%", border: "1px solid #fff"}}></div>
&nbsp; &nbsp;Text Color:&nbsp; &nbsp; <div className="labelColor" style={{width:"20px",height:"20px",backgroundColor:event.textColor, borderRadius:"50%", border: "1px solid #fff"}}></div>
</div>
</div>
</div>
</div>
<a
href={`#/`}
className="flex-no-shrink bg-red-400 hover:bg-red-500 px-3 ml-4 py-1 text shadow-sm hover:shadow-lg font-medium tracking-wider border-2 border-red-300 hover:border-red-500 text-white rounded-full transition ease-in duration-300"

style={{height:"40px"}}
onClick={async ()=>{
await removeEvent(event._id,reason)
window.location.reload()
Expand All @@ -239,9 +240,6 @@ const Admin = () => {
<b> ✘ </b>
</a>
</div>
</div>
</div>
</div>
<br />
<hr></hr>
<div className="mt-2 text-gray-400 break-words text-sm">
Expand Down
3 changes: 3 additions & 0 deletions src/pages/admin/styles.css
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
#container{
margin: 0 auto;
}
.mod-btn{
padding-top: 10px;
}

0 comments on commit dd494c3

Please sign in to comment.