From b374295227cb4498d7066f2286b8352189ee7a53 Mon Sep 17 00:00:00 2001 From: Tiffany-Zhu5303 Date: Thu, 19 Jan 2023 09:12:01 -0500 Subject: [PATCH 1/7] All pages connected --- views/js/evently/src/AboutUs.css | 6 +++++ views/js/evently/src/AboutUs.jsx | 12 ++++++++++ views/js/evently/src/App.css | 26 -------------------- views/js/evently/src/App.js | 20 +++++++--------- views/js/evently/src/CommunityPage.css | 6 +++++ views/js/evently/src/CommunityPage.jsx | 12 ++++++++++ views/js/evently/src/CreateEvent.jsx | 2 -- views/js/evently/src/HomePage.css | 33 +++----------------------- views/js/evently/src/HomePage.jsx | 16 +++++-------- views/js/evently/src/header.css | 33 +++++++++++++------------- 10 files changed, 70 insertions(+), 96 deletions(-) create mode 100644 views/js/evently/src/AboutUs.css create mode 100644 views/js/evently/src/AboutUs.jsx create mode 100644 views/js/evently/src/CommunityPage.css create mode 100644 views/js/evently/src/CommunityPage.jsx diff --git a/views/js/evently/src/AboutUs.css b/views/js/evently/src/AboutUs.css new file mode 100644 index 00000000..b860e53b --- /dev/null +++ b/views/js/evently/src/AboutUs.css @@ -0,0 +1,6 @@ +.AboutUs { + background-color: white; + text-align: center; + height: 100%; + width: 100%; +} \ No newline at end of file diff --git a/views/js/evently/src/AboutUs.jsx b/views/js/evently/src/AboutUs.jsx new file mode 100644 index 00000000..926b4d92 --- /dev/null +++ b/views/js/evently/src/AboutUs.jsx @@ -0,0 +1,12 @@ +import React from 'react' +import './AboutUs.css' + +function AboutUs() { + return ( +
+

Work in progress!

+
+ ) +}; + +export default AboutUs; \ No newline at end of file diff --git a/views/js/evently/src/App.css b/views/js/evently/src/App.css index 75ffb084..2e82e466 100644 --- a/views/js/evently/src/App.css +++ b/views/js/evently/src/App.css @@ -2,32 +2,6 @@ text-align: center; } -.App-logo { - height: 40vmin; - pointer-events: none; -} - -@media (prefers-reduced-motion: no-preference) { - .App-logo { - animation: App-logo-spin infinite 20s linear; - } -} - -.App-header { - background-color: #282c34; - min-height: 100vh; - display: flex; - flex-direction: column; - align-items: center; - justify-content: center; - font-size: calc(10px + 2vmin); - color: white; -} - -.App-link { - color: #61dafb; -} - ul{ list-style-type: none; margin: 0; diff --git a/views/js/evently/src/App.js b/views/js/evently/src/App.js index 9c8b8082..ec253f00 100644 --- a/views/js/evently/src/App.js +++ b/views/js/evently/src/App.js @@ -6,10 +6,9 @@ import { } from "react-router-dom"; import HomePage from './HomePage.jsx'; import CreateEvent from './CreateEvent.jsx'; -// import RSVP from './RSVP.jsx'; -//import ViewEvent from './ViewEvent.jsx'; -//Add About Us page -//Add a community page +import CommunityPage from './CommunityPage.jsx'; +import AboutUs from './AboutUs.jsx'; +import Header from './header.js'; function App() { return ( @@ -23,20 +22,17 @@ function App() { Create
  • -

    RSVP

    - {/* RSVP */} + Community
  • -

    Community

    - {/* Community */} -
    • -
  • -

    About Us

    - {/* About Us */} + About Us
    • +
    + } /> + } /> } /> } /> diff --git a/views/js/evently/src/CommunityPage.css b/views/js/evently/src/CommunityPage.css new file mode 100644 index 00000000..08c2c1d4 --- /dev/null +++ b/views/js/evently/src/CommunityPage.css @@ -0,0 +1,6 @@ +.Community { + background-color: white; + text-align: center; + height: 100%; + width: 100%; +} \ No newline at end of file diff --git a/views/js/evently/src/CommunityPage.jsx b/views/js/evently/src/CommunityPage.jsx new file mode 100644 index 00000000..2c023b79 --- /dev/null +++ b/views/js/evently/src/CommunityPage.jsx @@ -0,0 +1,12 @@ +import React from 'react' +import './CommunityPage.css' + +function CommunityPage() { + return ( +
    +

    Work in progress!

    +
    + ) +}; + +export default CommunityPage; \ No newline at end of file diff --git a/views/js/evently/src/CreateEvent.jsx b/views/js/evently/src/CreateEvent.jsx index 287347ba..38cb6131 100644 --- a/views/js/evently/src/CreateEvent.jsx +++ b/views/js/evently/src/CreateEvent.jsx @@ -1,6 +1,5 @@ import React, {useState} from 'react'; import './CreateEvent.css'; -import Header from './header.js'; function CreateEvent() { const [file, setFile] = useState(); @@ -37,7 +36,6 @@ console.log(res) console.log("EventTitle", EventTitle) return(
    -

    Enter the details of your event:

    diff --git a/views/js/evently/src/HomePage.css b/views/js/evently/src/HomePage.css index 1c9719ea..860f44f8 100644 --- a/views/js/evently/src/HomePage.css +++ b/views/js/evently/src/HomePage.css @@ -1,21 +1,15 @@ html { background-color: #EE6123; -} - -#MainText { - /* background of page */ - background-color: #EE6123; - margin: 0; width: auto; height: auto; overflow: auto; +} - /* page text */ +#MainText { + background-color: #EE6123; font-size: 30px; font-family: 'Inter'; text-align: center; - - padding-top: 125px; } .buttons{ @@ -34,27 +28,6 @@ html { border-radius: 8px; } -#HomeLogo{ - background-color: white; - border-radius: 50%; - padding: 7px; - - height: 100px; - width: 100px; - - top: 150px; - left: 10px; - position: absolute; - overflow: hidden; -} - -.Title{ - position: absolute; - top: 135px; - left: 150px; - color: rgb(255, 255, 255, 0.8); -} - .Text{ font-size: 80px; color: white; diff --git a/views/js/evently/src/HomePage.jsx b/views/js/evently/src/HomePage.jsx index 6d40d157..dd38a943 100644 --- a/views/js/evently/src/HomePage.jsx +++ b/views/js/evently/src/HomePage.jsx @@ -1,25 +1,21 @@ import React from "react"; import { - Routes, - Route, Link } from "react-router-dom"; import './App.css' import './HomePage.css' -import CreateEvent from './CreateEvent.jsx'; -import logo from './bitly-logo.png'; +import CreateEvent from './CreateEvent.jsx' +import CommunityPage from './CommunityPage.jsx' const HomePage: React.FC = () => { return ( -
    - +
    -

    Event.ly

    -

    Host your events here!

    +

    Host your events here!

    Get Started -

    Find an event!

    - +

    Find an event!

    + Browse
    ); diff --git a/views/js/evently/src/header.css b/views/js/evently/src/header.css index 9fb3f5d9..06df519c 100644 --- a/views/js/evently/src/header.css +++ b/views/js/evently/src/header.css @@ -1,22 +1,23 @@ .Header { - width: 100%; - display: inline-block; - background-color: rgba(238, 97, 35); - color: rgba(255, 255, 255, 0.8); - text-align: center; - font-size: 30px; - } + width: 100%; + display: inline-block; + background-color: rgba(238, 97, 35); + color: rgba(255, 255, 255, 0.8); + text-indent: 150px; + font-size: 30px; + font-family: 'Inter'; +} #createLogo { - background-color: white; - border-radius: 50%; - padding: 7px; +background-color: white; +border-radius: 50%; +padding: 7px; - height: 100px; - width: 100px; +height: 100px; +width: 100px; - top: 135px; - left: 675px; - position: absolute; - overflow: hidden; +top: 100px; +left: 10px; +position: absolute; +overflow: hidden; } \ No newline at end of file From 984e612cd16c4186b6a72ab19985db82d659e916 Mon Sep 17 00:00:00 2001 From: Tiffany-Zhu5303 Date: Thu, 19 Jan 2023 09:26:47 -0500 Subject: [PATCH 2/7] adding on to info on pages --- views/js/evently/src/AboutUs.jsx | 21 ++++++++++++++++++++- views/js/evently/src/CreateEvent.jsx | 2 +- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/views/js/evently/src/AboutUs.jsx b/views/js/evently/src/AboutUs.jsx index 926b4d92..cf1b5a35 100644 --- a/views/js/evently/src/AboutUs.jsx +++ b/views/js/evently/src/AboutUs.jsx @@ -4,7 +4,26 @@ import './AboutUs.css' function AboutUs() { return (
    -

    Work in progress!

    +

    The team:

    +
    +
      +
    • Laurent Benjamin
      • +
    • Noshin Ahmed
      • +
    • Sharron Qian
      • +
    • Tiffany Zhu
      • +
    • Umida Ravshanova
      • +
    +
    +

    Special thanks to:

    +
    +
      +
    • Diana Bishop
      • +
    • Ange Louis
      • +
    • Grace McGrath
      • +
    • Makayla Clausen
      • +
    +
    +

    and everyone at Bitly who guided us on his project!

    ) }; diff --git a/views/js/evently/src/CreateEvent.jsx b/views/js/evently/src/CreateEvent.jsx index 38cb6131..48c678d0 100644 --- a/views/js/evently/src/CreateEvent.jsx +++ b/views/js/evently/src/CreateEvent.jsx @@ -101,7 +101,7 @@ console.log("EventTitle", EventTitle)

    Contact info

    setContactForm(e.target.value)}/>



    - +
    From 77dff22641136d0e68e8ec17a6838eb8e22608d7 Mon Sep 17 00:00:00 2001 From: Tiffany-Zhu5303 Date: Thu, 19 Jan 2023 12:00:05 -0500 Subject: [PATCH 3/7] RSVP routed --- handlers/events.go | 31 ++++++++++--------- main.go | 2 +- views/js/evently/src/App.js | 3 +- views/js/evently/src/RSVP.jsx | 49 +++++++++++++++++++----------- views/js/evently/src/ViewEvent.jsx | 2 +- 5 files changed, 51 insertions(+), 36 deletions(-) diff --git a/handlers/events.go b/handlers/events.go index 3530f9dd..d1642890 100644 --- a/handlers/events.go +++ b/handlers/events.go @@ -12,9 +12,9 @@ import ( func CreateEvent(c *gin.Context) { var event models.CreateEvent c.Writer.Header().Set("Access-Control-Allow-Origin", "*") - c.Writer.Header().Set("Access-Control-Allow-Credentials", "true") - c.Writer.Header().Set("Access-Control-Allow-Headers", "Content-Type, Content-Length, Accept-Encoding, X-CSRF-Token, Authorization, accept, origin, Cache-Control, X-Requested-With") - c.Writer.Header().Set("Access-Control-Allow-Methods", "POST, OPTIONS, GET, PUT") + c.Writer.Header().Set("Access-Control-Allow-Credentials", "true") + c.Writer.Header().Set("Access-Control-Allow-Headers", "Content-Type, Content-Length, Accept-Encoding, X-CSRF-Token, Authorization, accept, origin, Cache-Control, X-Requested-With") + c.Writer.Header().Set("Access-Control-Allow-Methods", "POST, OPTIONS, GET, PUT") // Call BindJSON to bind the received JSON to event +add error handling later if err := c.BindJSON(&event); err != nil { fmt.Printf("error %+v", err) @@ -33,7 +33,7 @@ func CreateEvent(c *gin.Context) { eventrow, err := dbmap.Query( "SELECT event_id, title, date, time, location, host_name, description, contact_info, public_private, num_of_RSVP, max_attendees FROM event ORDER BY event_id DESC LIMIT 1") - var events []models.GetEvent + var events []models.GetEvent for eventrow.Next() { var event models.GetEvent @@ -53,9 +53,9 @@ func CreateEvent(c *gin.Context) { func GetEvent(c *gin.Context) { var events []models.GetEvent c.Writer.Header().Set("Access-Control-Allow-Origin", "*") - c.Writer.Header().Set("Access-Control-Allow-Credentials", "true") - c.Writer.Header().Set("Access-Control-Allow-Headers", "Content-Type, Content-Length, Accept-Encoding, X-CSRF-Token, Authorization, accept, origin, Cache-Control, X-Requested-With") - c.Writer.Header().Set("Access-Control-Allow-Methods", "POST, OPTIONS, GET, PUT") + c.Writer.Header().Set("Access-Control-Allow-Credentials", "true") + c.Writer.Header().Set("Access-Control-Allow-Headers", "Content-Type, Content-Length, Accept-Encoding, X-CSRF-Token, Authorization, accept, origin, Cache-Control, X-Requested-With") + c.Writer.Header().Set("Access-Control-Allow-Methods", "POST, OPTIONS, GET, PUT") seeRow := c.Param("eventID") eventrow, err := dbmap.Query( @@ -78,14 +78,13 @@ func GetEvent(c *gin.Context) { func HandleCors(c *gin.Context) { c.Writer.Header().Set("Access-Control-Allow-Origin", "*") - c.Writer.Header().Set("Access-Control-Allow-Credentials", "true") - c.Writer.Header().Set("Access-Control-Allow-Headers", "Content-Type, Content-Length, Accept-Encoding, X-CSRF-Token, Authorization, accept, origin, Cache-Control, X-Requested-With") - c.Writer.Header().Set("Access-Control-Allow-Methods", "POST, OPTIONS, GET, PUT") + c.Writer.Header().Set("Access-Control-Allow-Credentials", "true") + c.Writer.Header().Set("Access-Control-Allow-Headers", "Content-Type, Content-Length, Accept-Encoding, X-CSRF-Token, Authorization, accept, origin, Cache-Control, X-Requested-With") + c.Writer.Header().Set("Access-Control-Allow-Methods", "POST, OPTIONS, GET, PUT") + c.AbortWithStatus(204) + return - c.AbortWithStatus(204) - return - } // creates a new event @@ -169,7 +168,10 @@ func UpdateEvent(c *gin.Context) { func CreateRSVP(c *gin.Context) { var rsvp models.CreateRSVP - + c.Writer.Header().Set("Access-Control-Allow-Origin", "*") + c.Writer.Header().Set("Access-Control-Allow-Credentials", "true") + c.Writer.Header().Set("Access-Control-Allow-Headers", "Content-Type, Content-Length, Accept-Encoding, X-CSRF-Token, Authorization, accept, origin, Cache-Control, X-Requested-With") + c.Writer.Header().Set("Access-Control-Allow-Methods", "POST, OPTIONS, GET, PUT") // Call BindJSON to bind the received JSON to event +add error handling later if err := c.BindJSON(&rsvp); err != nil { fmt.Println(err) @@ -242,4 +244,3 @@ func DeleteEvent(c *gin.Context) { } c.JSON(204, nil) //success } - diff --git a/main.go b/main.go index d425bc9d..7f52650b 100644 --- a/main.go +++ b/main.go @@ -36,11 +36,11 @@ func main() { api.GET("/event/:eventID", handlers.GetEvent) api.OPTIONS("/event/:eventID", handlers.HandleCors) - // This endpoint will update info for an event api.PATCH("/event/:eventID", handlers.UpdateEvent) api.POST("/event/:eventID/rsvp", handlers.CreateRSVP) + api.OPTIONS("/event/:eventID/rsvp", handlers.HandleCors) api.GET("/RSVP/:responseID", handlers.GetRSVP) diff --git a/views/js/evently/src/App.js b/views/js/evently/src/App.js index 465f73f3..7213b30b 100644 --- a/views/js/evently/src/App.js +++ b/views/js/evently/src/App.js @@ -6,7 +6,7 @@ import { } from "react-router-dom"; import HomePage from './HomePage.jsx'; import CreateEvent from './CreateEvent.jsx'; -// import RSVP from './RSVP.jsx'; +import RSVP from './RSVP.jsx'; import ViewEvent from './ViewEvent.jsx'; //Add About Us page //Add a community page @@ -37,6 +37,7 @@ function App() { + } /> } /> } /> } /> diff --git a/views/js/evently/src/RSVP.jsx b/views/js/evently/src/RSVP.jsx index ec1f0207..f571cac5 100644 --- a/views/js/evently/src/RSVP.jsx +++ b/views/js/evently/src/RSVP.jsx @@ -1,29 +1,46 @@ -import React from "react"; +import React, {useState} from 'react'; +import {useParams} from "react-router-dom"; import './App.css' import './RSVP.css' import logo from './bitly-logo.png'; - function RSVP() { + const [EventID, setEventID ] = useState(""); + const [ResponderName, setResponderName] = useState(""); + const [RSVP, setRSVP] = useState(""); + let { event_id } = useParams(); + const handleSubmit = async (e) => { + console.log("Hello") + e.preventDefault() + try { + var res = await fetch(`http://localhost:3000/api/event/${event_id}/rsvp`, { + method: "POST", + //headers: { 'Content-Type': 'application/json' }, + mode: "cors", + body: JSON.stringify({ + event_id: parseInt(event_id) , name: ResponderName, rsvp: RSVP + }), + }); + console.log(res) + } + catch (err){console.log(err, "Error!");} + let resJson = await res.json() + if (res.status === 201) window.location.replace("/") + } return(
    Bitly Logo

    Event.ly

    RSVP

    -
    + - - - - setResponderName(e.target.value)} className="Name:" required /> - setRSVP(e.target.value)} className="dropdown"> + - - + {/* + */} - - - - - +
    diff --git a/views/js/evently/src/ViewEvent.jsx b/views/js/evently/src/ViewEvent.jsx index bb0e94e4..5dc3ca0e 100644 --- a/views/js/evently/src/ViewEvent.jsx +++ b/views/js/evently/src/ViewEvent.jsx @@ -51,7 +51,7 @@ function ViewEvent() {


    -
    From 5c0b94a83c1f73107e76d1c5e9f643236fcf512f Mon Sep 17 00:00:00 2001 From: Laurent2456 <73558203+Laurent2456@users.noreply.github.com> Date: Thu, 19 Jan 2023 13:59:07 -0500 Subject: [PATCH 4/7] fixed frontend --- views/js/evently/src/CreateEvent.jsx | 7 ------- 1 file changed, 7 deletions(-) diff --git a/views/js/evently/src/CreateEvent.jsx b/views/js/evently/src/CreateEvent.jsx index 48c678d0..f4f8ac7c 100644 --- a/views/js/evently/src/CreateEvent.jsx +++ b/views/js/evently/src/CreateEvent.jsx @@ -115,13 +115,6 @@ console.log("EventTitle", EventTitle)



    -
    - {/* Button to publish draft */} - - - {/* Button to save draft (if have time) */} - -
    From 267a94fe20fe5488f2a15d67751fe0b22f3b8fd6 Mon Sep 17 00:00:00 2001 From: Sharron Qian Date: Thu, 19 Jan 2023 17:02:36 -0500 Subject: [PATCH 5/7] Routed RSVP button on view event page to RSVP and fixed styling errors --- handlers/events.go | 31 +++++++++-------- main.go | 2 +- views/js/evently/src/App.css | 9 +++++ views/js/evently/src/App.js | 6 ++-- views/js/evently/src/CreateEvent.css | 29 ++++++++++------ views/js/evently/src/HomePage.css | 4 +++ views/js/evently/src/RSVP.css | 14 ++------ views/js/evently/src/RSVP.jsx | 51 +++++++++++++++++----------- views/js/evently/src/ViewEvent.css | 4 +++ views/js/evently/src/ViewEvent.jsx | 3 +- views/js/evently/src/header.css | 2 +- views/js/evently/src/header.js | 3 +- 12 files changed, 94 insertions(+), 64 deletions(-) diff --git a/handlers/events.go b/handlers/events.go index 3530f9dd..d1642890 100644 --- a/handlers/events.go +++ b/handlers/events.go @@ -12,9 +12,9 @@ import ( func CreateEvent(c *gin.Context) { var event models.CreateEvent c.Writer.Header().Set("Access-Control-Allow-Origin", "*") - c.Writer.Header().Set("Access-Control-Allow-Credentials", "true") - c.Writer.Header().Set("Access-Control-Allow-Headers", "Content-Type, Content-Length, Accept-Encoding, X-CSRF-Token, Authorization, accept, origin, Cache-Control, X-Requested-With") - c.Writer.Header().Set("Access-Control-Allow-Methods", "POST, OPTIONS, GET, PUT") + c.Writer.Header().Set("Access-Control-Allow-Credentials", "true") + c.Writer.Header().Set("Access-Control-Allow-Headers", "Content-Type, Content-Length, Accept-Encoding, X-CSRF-Token, Authorization, accept, origin, Cache-Control, X-Requested-With") + c.Writer.Header().Set("Access-Control-Allow-Methods", "POST, OPTIONS, GET, PUT") // Call BindJSON to bind the received JSON to event +add error handling later if err := c.BindJSON(&event); err != nil { fmt.Printf("error %+v", err) @@ -33,7 +33,7 @@ func CreateEvent(c *gin.Context) { eventrow, err := dbmap.Query( "SELECT event_id, title, date, time, location, host_name, description, contact_info, public_private, num_of_RSVP, max_attendees FROM event ORDER BY event_id DESC LIMIT 1") - var events []models.GetEvent + var events []models.GetEvent for eventrow.Next() { var event models.GetEvent @@ -53,9 +53,9 @@ func CreateEvent(c *gin.Context) { func GetEvent(c *gin.Context) { var events []models.GetEvent c.Writer.Header().Set("Access-Control-Allow-Origin", "*") - c.Writer.Header().Set("Access-Control-Allow-Credentials", "true") - c.Writer.Header().Set("Access-Control-Allow-Headers", "Content-Type, Content-Length, Accept-Encoding, X-CSRF-Token, Authorization, accept, origin, Cache-Control, X-Requested-With") - c.Writer.Header().Set("Access-Control-Allow-Methods", "POST, OPTIONS, GET, PUT") + c.Writer.Header().Set("Access-Control-Allow-Credentials", "true") + c.Writer.Header().Set("Access-Control-Allow-Headers", "Content-Type, Content-Length, Accept-Encoding, X-CSRF-Token, Authorization, accept, origin, Cache-Control, X-Requested-With") + c.Writer.Header().Set("Access-Control-Allow-Methods", "POST, OPTIONS, GET, PUT") seeRow := c.Param("eventID") eventrow, err := dbmap.Query( @@ -78,14 +78,13 @@ func GetEvent(c *gin.Context) { func HandleCors(c *gin.Context) { c.Writer.Header().Set("Access-Control-Allow-Origin", "*") - c.Writer.Header().Set("Access-Control-Allow-Credentials", "true") - c.Writer.Header().Set("Access-Control-Allow-Headers", "Content-Type, Content-Length, Accept-Encoding, X-CSRF-Token, Authorization, accept, origin, Cache-Control, X-Requested-With") - c.Writer.Header().Set("Access-Control-Allow-Methods", "POST, OPTIONS, GET, PUT") + c.Writer.Header().Set("Access-Control-Allow-Credentials", "true") + c.Writer.Header().Set("Access-Control-Allow-Headers", "Content-Type, Content-Length, Accept-Encoding, X-CSRF-Token, Authorization, accept, origin, Cache-Control, X-Requested-With") + c.Writer.Header().Set("Access-Control-Allow-Methods", "POST, OPTIONS, GET, PUT") + c.AbortWithStatus(204) + return - c.AbortWithStatus(204) - return - } // creates a new event @@ -169,7 +168,10 @@ func UpdateEvent(c *gin.Context) { func CreateRSVP(c *gin.Context) { var rsvp models.CreateRSVP - + c.Writer.Header().Set("Access-Control-Allow-Origin", "*") + c.Writer.Header().Set("Access-Control-Allow-Credentials", "true") + c.Writer.Header().Set("Access-Control-Allow-Headers", "Content-Type, Content-Length, Accept-Encoding, X-CSRF-Token, Authorization, accept, origin, Cache-Control, X-Requested-With") + c.Writer.Header().Set("Access-Control-Allow-Methods", "POST, OPTIONS, GET, PUT") // Call BindJSON to bind the received JSON to event +add error handling later if err := c.BindJSON(&rsvp); err != nil { fmt.Println(err) @@ -242,4 +244,3 @@ func DeleteEvent(c *gin.Context) { } c.JSON(204, nil) //success } - diff --git a/main.go b/main.go index d425bc9d..7f52650b 100644 --- a/main.go +++ b/main.go @@ -36,11 +36,11 @@ func main() { api.GET("/event/:eventID", handlers.GetEvent) api.OPTIONS("/event/:eventID", handlers.HandleCors) - // This endpoint will update info for an event api.PATCH("/event/:eventID", handlers.UpdateEvent) api.POST("/event/:eventID/rsvp", handlers.CreateRSVP) + api.OPTIONS("/event/:eventID/rsvp", handlers.HandleCors) api.GET("/RSVP/:responseID", handlers.GetRSVP) diff --git a/views/js/evently/src/App.css b/views/js/evently/src/App.css index 2e82e466..19f13a20 100644 --- a/views/js/evently/src/App.css +++ b/views/js/evently/src/App.css @@ -1,5 +1,14 @@ +html, body { + margin: 0; + padding: 0; + border: 0; +} + .App { text-align: center; + margin: 0; + padding: 0; + border: 0; } ul{ diff --git a/views/js/evently/src/App.js b/views/js/evently/src/App.js index aab154a8..a30d3502 100644 --- a/views/js/evently/src/App.js +++ b/views/js/evently/src/App.js @@ -9,11 +9,12 @@ import CreateEvent from './CreateEvent.jsx'; import CommunityPage from './CommunityPage.jsx'; import AboutUs from './AboutUs.jsx'; import Header from './header.js'; +import RSVP from './RSVP.jsx'; import ViewEvent from './ViewEvent.jsx'; function App() { return ( -
    +
    + ); } diff --git a/views/js/evently/src/CreateEvent.css b/views/js/evently/src/CreateEvent.css index 1fdaf76e..82e3840f 100644 --- a/views/js/evently/src/CreateEvent.css +++ b/views/js/evently/src/CreateEvent.css @@ -1,22 +1,30 @@ +h4 { + margin-bottom: 25px; +} + fieldset { display: inline; } -.input-box-fieldset { - padding-left: 50px; - padding-right: 50px; - padding-bottom: 20px; +.wrapper { + height: 200%; + width: 200%; + margin: 0; + border: 0; + padding: 0; + background-color: white; } -.input-boxes { - width: 300px; +.input-box-fieldset, .pub-priv-box-fieldset { + width: 450px; + text-align: center; + padding-bottom: 30px; } -.pub-priv-box-fieldset { - padding-left: 151px; - padding-right: 151px; - padding-bottom: 30px; +.input-boxes { + padding:10px; + width: 400px; } .container { @@ -30,6 +38,7 @@ fieldset { padding-left: 50px; padding-top: 20px; padding-right:450px; + background-color: white; } .upload-container { diff --git a/views/js/evently/src/HomePage.css b/views/js/evently/src/HomePage.css index 860f44f8..f5ce3c58 100644 --- a/views/js/evently/src/HomePage.css +++ b/views/js/evently/src/HomePage.css @@ -12,6 +12,10 @@ html { text-align: center; } +.HomePage { + height: 800px; +} + .buttons{ background-color: #2E0096; color: white; diff --git a/views/js/evently/src/RSVP.css b/views/js/evently/src/RSVP.css index 2fa25299..a35ad894 100644 --- a/views/js/evently/src/RSVP.css +++ b/views/js/evently/src/RSVP.css @@ -5,23 +5,13 @@ html, body{ width: auto; height: auto; overflow: auto; - padding: 50px; + padding: none; /* page text */ font-size: 15px; font-family: 'Inter'; } -img{ - background-color: white; - border-radius: 50%; - padding: 7px; - height: 50px; - width: 50px; - top: 10px; - left: 10px; - position: absolute; - overflow: hidden; -} + .Title{ position: absolute; top: -10px; diff --git a/views/js/evently/src/RSVP.jsx b/views/js/evently/src/RSVP.jsx index ec1f0207..04e48ae2 100644 --- a/views/js/evently/src/RSVP.jsx +++ b/views/js/evently/src/RSVP.jsx @@ -1,29 +1,44 @@ -import React from "react"; +import React, {useState} from 'react'; +import {useParams} from "react-router-dom"; import './App.css' import './RSVP.css' import logo from './bitly-logo.png'; - function RSVP() { + const [EventID, setEventID ] = useState(""); + const [ResponderName, setResponderName] = useState(""); + const [RSVP, setRSVP] = useState(""); + let { event_id } = useParams(); + const handleSubmit = async (e) => { + console.log("Hello") + e.preventDefault() + try { + var res = await fetch(`http://localhost:3000/api/event/${event_id}/rsvp`, { + method: "POST", + //headers: { 'Content-Type': 'application/json' }, + mode: "cors", + body: JSON.stringify({ + event_id: parseInt(event_id) , name: ResponderName, rsvp: RSVP + }), + }); + console.log(res) + } + catch (err){console.log(err, "Error!");} + let resJson = await res.json() + if (res.status === 201) window.location.replace("/") + } return(
    - Bitly Logo -

    Event.ly

    RSVP

    -
    + - - - - setResponderName(e.target.value)} className="Name:" required /> - setRSVP(e.target.value)} className="dropdown"> + - - + {/* + */} - - - - - +
    diff --git a/views/js/evently/src/ViewEvent.css b/views/js/evently/src/ViewEvent.css index fd0c8454..e8cabc8f 100644 --- a/views/js/evently/src/ViewEvent.css +++ b/views/js/evently/src/ViewEvent.css @@ -1,3 +1,7 @@ +.wrapper { + overflow-x: hidden; +} + .image { height: 600px; width: 600px; diff --git a/views/js/evently/src/ViewEvent.jsx b/views/js/evently/src/ViewEvent.jsx index bb0e94e4..152b9e1c 100644 --- a/views/js/evently/src/ViewEvent.jsx +++ b/views/js/evently/src/ViewEvent.jsx @@ -30,7 +30,6 @@ function ViewEvent() { return(
    -

    You are invited!

    @@ -51,7 +50,7 @@ function ViewEvent() {


    -
    diff --git a/views/js/evently/src/header.css b/views/js/evently/src/header.css index 06df519c..0798ba67 100644 --- a/views/js/evently/src/header.css +++ b/views/js/evently/src/header.css @@ -17,7 +17,7 @@ height: 100px; width: 100px; top: 100px; -left: 10px; +left: 20px; position: absolute; overflow: hidden; } \ No newline at end of file diff --git a/views/js/evently/src/header.js b/views/js/evently/src/header.js index e1f4da45..3e365e09 100644 --- a/views/js/evently/src/header.js +++ b/views/js/evently/src/header.js @@ -7,8 +7,9 @@ function Header() {
    +

    Event.ly

    -

    Event.ly

    +
    ); } From 3f6fcec15d73a9fd3666f4c627070545d0f4e9d4 Mon Sep 17 00:00:00 2001 From: Tiffany-Zhu5303 Date: Thu, 19 Jan 2023 20:52:57 -0500 Subject: [PATCH 6/7] merged --- views/js/evently/src/ViewEvent.jsx | 4 ---- 1 file changed, 4 deletions(-) diff --git a/views/js/evently/src/ViewEvent.jsx b/views/js/evently/src/ViewEvent.jsx index 6fc5c477..152b9e1c 100644 --- a/views/js/evently/src/ViewEvent.jsx +++ b/views/js/evently/src/ViewEvent.jsx @@ -50,11 +50,7 @@ function ViewEvent() {


    -<<<<<<< HEAD
    From 4678907b39c4ed09776eb496d3e26e77007d7447 Mon Sep 17 00:00:00 2001 From: Sharron Qian Date: Fri, 20 Jan 2023 09:28:27 -0500 Subject: [PATCH 7/7] Cleaned up code --- views/js/evently/src/RSVP.jsx | 16 ++++++---------- views/js/evently/src/ViewEvent.jsx | 4 ---- 2 files changed, 6 insertions(+), 14 deletions(-) diff --git a/views/js/evently/src/RSVP.jsx b/views/js/evently/src/RSVP.jsx index 04e48ae2..6c0f1d19 100644 --- a/views/js/evently/src/RSVP.jsx +++ b/views/js/evently/src/RSVP.jsx @@ -15,13 +15,11 @@ function RSVP() { try { var res = await fetch(`http://localhost:3000/api/event/${event_id}/rsvp`, { method: "POST", - //headers: { 'Content-Type': 'application/json' }, mode: "cors", body: JSON.stringify({ event_id: parseInt(event_id) , name: ResponderName, rsvp: RSVP }), }); - console.log(res) } catch (err){console.log(err, "Error!");} let resJson = await res.json() @@ -38,18 +36,16 @@ function RSVP() { - - {/* - */} - diff --git a/views/js/evently/src/ViewEvent.jsx b/views/js/evently/src/ViewEvent.jsx index 6fc5c477..152b9e1c 100644 --- a/views/js/evently/src/ViewEvent.jsx +++ b/views/js/evently/src/ViewEvent.jsx @@ -50,11 +50,7 @@ function ViewEvent() {


    -<<<<<<< HEAD