Skip to content

Commit 0581d49

Browse files
arjun1237arjun1237
committed
updates
1 parent 8584edd commit 0581d49

12 files changed

+6812
-4882
lines changed

‎.gitignore

+2-1
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,5 @@ keys.js
2121

2222
npm-debug.log*
2323
yarn-debug.log*
24-
yarn-error.log*
24+
yarn-error.log*
25+
.vercel

‎package-lock.json

+6,777-4,821
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

+12-12
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,18 @@
33
"version": "0.1.0",
44
"private": true,
55
"dependencies": {
6-
"@fortawesome/fontawesome-svg-core": "^1.2.30",
7-
"@fortawesome/free-solid-svg-icons": "^5.14.0",
8-
"@fortawesome/react-fontawesome": "^0.1.11",
9-
"@testing-library/jest-dom": "^4.2.4",
10-
"@testing-library/react": "^9.5.0",
11-
"@testing-library/user-event": "^7.2.1",
12-
"axios": "0.19.2",
13-
"react": "^16.13.1",
14-
"react-dom": "^16.13.1",
15-
"react-scripts": "3.4.1",
16-
"styled-components": "^5.1.1",
17-
"uuid": "^8.3.0"
6+
"@fortawesome/fontawesome-svg-core": "^1.2.35",
7+
"@fortawesome/free-solid-svg-icons": "^5.15.3",
8+
"@fortawesome/react-fontawesome": "^0.1.14",
9+
"@testing-library/jest-dom": "^5.12.0",
10+
"@testing-library/react": "^11.2.6",
11+
"@testing-library/user-event": "^13.1.8",
12+
"axios": "0.21.1",
13+
"react": "^17.0.2",
14+
"react-dom": "^17.0.2",
15+
"react-scripts": "4.0.3",
16+
"styled-components": "^5.2.3",
17+
"uuid": "^8.3.2"
1818
},
1919
"scripts": {
2020
"start": "react-scripts start",

‎src/App.js

-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ import './App.css';
33
import Navbar from './components/Navbar'
44
import LandingPage from './components/LandingPage/LandingPage'
55
import Booking from './components/Booking/Booking';
6-
import ConformationPage from './components/Booking/ConformationPage'
7-
import SummaryPage from './components/Booking/SummaryPage'
86
import {DataContext} from './context/DataContextProvider'
97

108
function App() {

‎src/components/Booking/ConformationPage.jsx

-3
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@ import { StyledTicket } from "../../styling/StyledComponents";
33
import {DataContext} from '../../context/DataContextProvider'
44

55
class ConfirmationPage extends React.Component {
6-
constructor(props) {
7-
super(props);
8-
}
96

107
render() {
118
let {movies, movieSelect, dateSelect, timeSelect, seatSelect, popcorn, price, bookingID} = this.context

‎src/components/Booking/DateTimeSelection.jsx

-4
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@ import { DataContext } from "../../context/DataContextProvider";
44
import {v4 as uuidv4} from 'uuid'
55

66
export default class DateTimeSelection extends Component {
7-
constructor(props) {
8-
super(props);
9-
}
107

118
getDetails = () => {
129
let slots = this.context.slotDisplay;
@@ -51,7 +48,6 @@ export default class DateTimeSelection extends Component {
5148
};
5249

5350
render() {
54-
console.log(this.context);
5551
let payload = this.context.slotDisplay;
5652
let theatres = this.getDetails();
5753
let dSelect = this.context.dateSelect;

‎src/components/Booking/SeatSelection.jsx

-2
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ export default class SeatSelection extends Component {
2929

3030
selectSeat = (seat) => {
3131
seat = Number(seat)
32-
console.log(seat);
3332
let payload = [...this.state.seatsSelect];
3433
const index = payload.indexOf(seat);
3534
if (index > -1) {
@@ -44,7 +43,6 @@ export default class SeatSelection extends Component {
4443
render() {
4544
let { slotDetails } = this.context;
4645
let seatsBooked = slotDetails.seats_booked;
47-
console.log(seatsBooked)
4846
let seats = this.getSeats(seatsBooked);
4947
let m = -1;
5048
return (

‎src/components/Booking/SummaryPage.jsx

+2-5
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@ import { StyledTicket } from "../../styling/StyledComponents";
33
import {DataContext} from '../../context/DataContextProvider'
44

55
class SummaryPage extends React.Component {
6-
constructor(props) {
7-
super(props);
8-
}
96

107
handleChange = (e) => {
118
this.context.addPopcorn(e.target.checked)
@@ -38,7 +35,7 @@ class SummaryPage extends React.Component {
3835
</div>
3936
<div className="mtb flexEqual">
4037
<div className="textSecondary">
41-
<img src="https://image.flaticon.com/icons/svg/2933/2933170.svg" width="40px"/>
38+
<img src="https://image.flaticon.com/icons/svg/2933/2933170.svg" width="40px" alt="" />
4239
</div>
4340
<div className="textDark">
4441
<input type="checkbox" name="popcorn" onChange={this.handleChange} />
@@ -55,7 +52,7 @@ class SummaryPage extends React.Component {
5552
<div className="textSecondary">Amount Payable (inc. GST)</div>
5653
<div className="textLarge3 textDark">₹ {Math.round(price + (price*0.18))}</div>
5754
</div>
58-
<div className="button textCenter textLarge3 textB1" onClick={() => this.context.dataChange4()} style={{cursor: "pointer"}} >Pay Now</div>
55+
<div className="button textCenter textLarge3 textB1" onClick={this.context.dataChange4} style={{cursor: "pointer"}} >Pay Now</div>
5956
</StyledTicket>
6057
);
6158
}

‎src/components/LandingPage/LandingPage.jsx

-4
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,9 @@
11
import React from "react";
22
import MovieCard from "./MovieCard";
3-
import movieData from "../../JSON/movie.json"
43
import { StyledLandingPage } from "../../styling/StyledLandingPageComponents";
54
import {DataContext} from '../../context/DataContextProvider'
65

76
class LandingPage extends React.Component {
8-
constructor(props) {
9-
super(props);
10-
}
117

128
componentDidMount = () => {
139
this.context.setLocation()

‎src/components/Models/Locator.js

-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,5 @@ export default async function getLocation(){
55
let cityFetch = await fetch(`http://api.ipstack.com/${ipData.IPv4}?access_key=${keys.ipStack}&format=1`)
66
let cityData = await cityFetch.json()
77

8-
// console.log(ipData,cityData,cityData.city);
98
return cityData.city
109
}

‎src/components/Models/Models.js

-2
Original file line numberDiff line numberDiff line change
@@ -57,12 +57,10 @@ export class Slots {
5757
getAllSlotsBasedOnDateLocationMovie(date, location, movie_id) {
5858
// return slots based on date - return from context API
5959
let groupSlots = {};
60-
// console.log(this.slotsDB)
6160
this.slotsDB.forEach((slot) => {
6261
const cinema = new Cinema().getCinemaByID(slot.cinema_id);
6362
let today = new Date();
6463
const slotDate = new Date(today.setDate(today.getDate() + slot.date + 1));
65-
console.log(date, "1", this.destructureDate(slotDate), "here")
6664
let checkLine =
6765
cinema.location.toLowerCase() === location.toLowerCase() &&
6866
slot.movie_id === movie_id &&

‎src/context/DataContextProvider.jsx

+19-25
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import React, { Component } from "react";
1+
import React from "react";
22
import {
33
Movies as MovieData,
44
Slots as SlotData,
@@ -33,14 +33,6 @@ export default class DataContextProvider extends React.Component {
3333
this.slots = new SlotData();
3434
}
3535

36-
backToPhase2 = () => {
37-
console.log("2");
38-
};
39-
40-
backToPhase1 = () => {
41-
console.log("1");
42-
};
43-
4436
addPopcorn = (popcorn) => {
4537
this.setState({ popcorn });
4638
};
@@ -52,10 +44,12 @@ export default class DataContextProvider extends React.Component {
5244

5345
dataChange4 = (popcorn) => {
5446
let {slotSelect, seatSelect} = this.state
55-
this.slots.modifySlotsAddBookedSeats( slotSelect, seatSelect)
56-
this.setState({ popcorn, phase: 4, bookingID: uuidv4() }, () =>
57-
console.log(this.state)
58-
);
47+
this.slots.modifySlotsAddBookedSeats(slotSelect, seatSelect)
48+
this.setState({
49+
popcorn,
50+
phase: 4,
51+
bookingID: uuidv4()
52+
});
5953
};
6054

6155
dataChange3 = (seatSelect) => {
@@ -64,9 +58,11 @@ export default class DataContextProvider extends React.Component {
6458

6559
dataChange2 = (slotSelect) => {
6660
let slotDetails = this.slots.getSlotsByID(Number(slotSelect));
67-
this.setState({ slotSelect, phase: 2, slotDetails }, () =>
68-
console.log(this.state)
69-
);
61+
this.setState({
62+
slotSelect,
63+
phase: 2,
64+
slotDetails
65+
});
7066
};
7167

7268
dataChange1 = (movieSelect) => {
@@ -79,10 +75,12 @@ export default class DataContextProvider extends React.Component {
7975
this.state.location,
8076
movieSelect
8177
);
82-
console.log(dateSelect, slotDisplay);
83-
this.setState({ phase: 1, movieSelect, dateSelect, slotDisplay }, () =>
84-
console.log(this.state)
85-
);
78+
this.setState({
79+
phase: 1,
80+
movieSelect,
81+
dateSelect,
82+
slotDisplay
83+
});
8684
};
8785

8886
setPhase0 = () => {
@@ -154,7 +152,7 @@ export default class DataContextProvider extends React.Component {
154152
this.setState({ dateSelect, slotDisplay });
155153
};
156154

157-
getSlots = (date) => {
155+
getSlots = () => {
158156
let slotDisplay = this.slots.getAllSlotsBasedOnDateLocationMovie(
159157
this.state.dateSelect,
160158
this.state.location,
@@ -164,7 +162,6 @@ export default class DataContextProvider extends React.Component {
164162
};
165163

166164
returnFilter = () => {
167-
console.log("here");
168165
let filter = this.state.filterMovies.trim().toLowerCase();
169166
if (filter.length > 0) {
170167
return this.state.movies.filter((x) =>
@@ -198,10 +195,7 @@ export default class DataContextProvider extends React.Component {
198195
setPhase0: this.setPhase0,
199196
setPhase1: this.setPhase1,
200197
setPhase2: this.setPhase2,
201-
setPhase3: this.setPhase3,
202198
addPopcorn: this.addPopcorn,
203-
backToPhase1: this.backToPhase1,
204-
backToPhase2: this.backToPhase2,
205199
setLocation: this.setLocation,
206200
locationChange: this.locationChange,
207201
};

0 commit comments

Comments
 (0)