Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
254 commits
Select commit Hold shift + click to select a range
20df7cd
added working backend as group needed ASAP
JayKL Jun 10, 2019
554527a
stabilised file structure
Jun 10, 2019
2dd472e
navigation bar
fowusu Jun 10, 2019
16f9357
added attempt to include themoviedbapi dependency and settings.xml fo…
Jun 10, 2019
dbf7dad
merged testing with IMDB api attempt
JayKL Jun 10, 2019
15b4706
Update README.md
JayKL Jun 10, 2019
0ea4635
added encrypted constants file
Jun 10, 2019
f10c01c
implemented Humza's nowshowing functionality (needs fixing)
Jun 10, 2019
41d847b
api calls in place to retrieve up coming movie name, poster url and d…
markmuwonge Jun 10, 2019
711ffba
added mapping for getUpcoming() & code refactoring
markmuwonge Jun 10, 2019
8d18963
Update ApplicationStartup.java
markmuwonge Jun 10, 2019
6a30647
Merge pull request #1 from H-Yous/second-backend-attempt
JayKL Jun 11, 2019
a825d21
made backend folder
JayKL Jun 11, 2019
df6e0e3
setup for merging with dev branch
markmuwonge Jun 11, 2019
f767e05
Merge pull request #2 from H-Yous/upcoming-movies
markmuwonge Jun 11, 2019
10d88bb
setup for merging
fowusu Jun 11, 2019
dab12e5
Merge pull request #3 from H-Yous/dev-branch-navigationBar
fowusu Jun 11, 2019
7a2e3c4
Axios connection added to home
fowusu Jun 11, 2019
b4f062b
Update README.md
JayKL Jun 11, 2019
2227711
Update README.md
JayKL Jun 11, 2019
230720e
Update README.md
JayKL Jun 11, 2019
38e4d4c
Update README.md
JayKL Jun 11, 2019
5e91c79
Update README.md
JayKL Jun 11, 2019
07553b4
upcoming-movies functionality in place for backend
markmuwonge Jun 11, 2019
9b48e95
added carousel
fowusu Jun 11, 2019
7cfc681
changes
fowusu Jun 11, 2019
89209ef
updated backend
fowusu Jun 11, 2019
d0d000f
added showing model interacting with repository
JayKL Jun 11, 2019
b685830
added content loading for NowShowing
Jun 11, 2019
8488743
added interaction with Showing Service layer
JayKL Jun 11, 2019
a701019
Merge branch 'dev-branch-navigationBar' into dev-branch-contentLoading
nsmj63 Jun 11, 2019
6243fa4
Merge pull request #4 from H-Yous/dev-branch-contentLoading
nsmj63 Jun 11, 2019
6c027c0
submitting a showing now checks if the shownig is already in the data…
JayKL Jun 11, 2019
013ad8a
implemented now showing functionality
markmuwonge Jun 11, 2019
2a854ca
added conatct panel page (no backend connection yet)
Jun 11, 2019
25edde3
Merge pull request #5 from H-Yous/dev-branch-nowshowingmovies
markmuwonge Jun 11, 2019
b17ecbc
added script-tag embed for citymapper api
Jun 11, 2019
30bf3a1
Update pom.properties
JayKL Jun 11, 2019
9d5d98c
Merge pull request #7 from H-Yous/dev-branch-shows-screens-day
JayKL Jun 11, 2019
8f75217
Added Carousel integration with backend
fowusu Jun 11, 2019
4585ea7
prettified contacts page with citymapper
Jun 11, 2019
711b4d6
added carousel
fowusu Jun 11, 2019
d4e75fe
Merge branch 'dev-branch-navigationBar' of https://github.com/H-Yous/…
fowusu Jun 11, 2019
33322f5
Merge branch 'dev-branch' into dev-branch-navigationBar
fowusu Jun 11, 2019
4d2a9c5
Merge pull request #8 from H-Yous/dev-branch-navigationBar
fowusu Jun 11, 2019
34982d5
new release gallery back-end implemented
markmuwonge Jun 11, 2019
dbbfb2d
Update README.md
JayKL Jun 12, 2019
04eeb4c
added npms batch file to run before development
Jun 12, 2019
d44bac8
added buildsuccess.png
JayKL Jun 12, 2019
cbaea1b
Update README.md
JayKL Jun 12, 2019
10477d0
added constants class, added booking model and repo
JayKL Jun 12, 2019
9e99ec3
Merge branch 'dev-branch-booking' of https://github.com/H-Yous/QAGrou…
JayKL Jun 12, 2019
c1a64b4
Code modification to retrieve high quality posters
markmuwonge Jun 12, 2019
366a851
Added About page
Alizahid11 Jun 12, 2019
466ab03
Merge branch 'dev-branch' into dev-branch-newreleases
markmuwonge Jun 12, 2019
fbb83c4
Merge pull request #10 from H-Yous/dev-branch-newreleases
markmuwonge Jun 12, 2019
9b46c11
changed showings to match seat.io, added bookings
JayKL Jun 12, 2019
975af2f
added find by event key
JayKL Jun 12, 2019
e425654
Added Two screens + Booking screen api
Jun 12, 2019
f18b88d
added almost-working contact emailing functionality
Jun 12, 2019
4cf0308
login page
Alizahid11 Jun 12, 2019
e47533e
payment via stripe added
fowusu Jun 12, 2019
3643a94
First commit
markmuwonge Jun 12, 2019
0d7f29f
merging fix
JayKL Jun 12, 2019
ea578b7
merge fix
markmuwonge Jun 12, 2019
f12090a
Added Third screen to Screens page
Jun 12, 2019
2ef6ac4
Merge pull request #12 from H-Yous/dev-branch-booking
JayKL Jun 12, 2019
3b2808c
removed batch files to later add to dev-branch
Jun 12, 2019
00cc30a
deleted target folder
markmuwonge Jun 12, 2019
1cb929e
Merge pull request #13 from H-Yous/dev-branch-screens
H-Yous Jun 12, 2019
14f38a4
fixing merge issues
fowusu Jun 12, 2019
c38b995
Merge branch 'dev-branch' into dev-branch-newreleases
markmuwonge Jun 12, 2019
d77d35b
Merge pull request #14 from H-Yous/dev-branch-newreleases
markmuwonge Jun 12, 2019
cb17820
removed target folder in backend
Alizahid11 Jun 12, 2019
67ae6c0
removed target folder
Jun 12, 2019
f5ce7bf
Merge branch 'dev-branch' into dev-branch-payment
fowusu Jun 12, 2019
4b8d060
Merge pull request #15 from H-Yous/dev-branch-payment
fowusu Jun 12, 2019
246d0f1
Merge branch 'dev-branch' into dev-branch-login
Alizahid11 Jun 12, 2019
85e85cf
Merge pull request #17 from H-Yous/dev-branch-login
Alizahid11 Jun 12, 2019
857595f
Merge branch 'dev-branch' into dev-branch-mailing
nsmj63 Jun 12, 2019
a198a54
Merge pull request #19 from H-Yous/dev-branch-mailing
nsmj63 Jun 12, 2019
769cb1a
added batch files for backend and frontend
Jun 12, 2019
5e7d4d9
fixed package structure backend
JayKL Jun 12, 2019
894dcaa
package changes
JayKL Jun 12, 2019
61ff8c9
Update README.md
nsmj63 Jun 12, 2019
adce3f3
Update README.md
nsmj63 Jun 12, 2019
f7321bd
Added multiple page folders
Jun 12, 2019
e73a519
folders
Jun 12, 2019
95fd899
added about folder
Jun 12, 2019
74ae40a
added about folder
Jun 12, 2019
2eed670
Added multiple folders
Jun 12, 2019
84d0e21
Fixed folder structure
Jun 12, 2019
f4f8576
added archtitecture image
JayKL Jun 12, 2019
5252f3e
fixed wonky line in architecture.png
JayKL Jun 12, 2019
f60c4f8
Update README.md
JayKL Jun 12, 2019
4865eaf
Merge branch 'dev-branch' of https://github.com/H-Yous/QAGroupProject…
JayKL Jun 12, 2019
11bcdb8
implemented back-end functionality for classifications page
markmuwonge Jun 12, 2019
df0caf0
mostly fixed compilation errors, todo: login page fix
Jun 12, 2019
58400a8
fixed folder structure breakages, implemented Humza's login functiona…
Jun 13, 2019
0d1e3a0
deleted pom.properties
Jun 13, 2019
edc79b5
Merge pull request #21 from H-Yous/dev-branch-Front-End-folders
nsmj63 Jun 13, 2019
96ff6ea
added back application.properties
Jun 13, 2019
1590101
fixed ApplciationStartup.java
Jun 13, 2019
7caee30
added more constants, fixed cross origin, fixed toString
JayKL Jun 13, 2019
5ff6647
added enums to event, added encapsulation aka private members to prev…
JayKL Jun 13, 2019
978d47b
added booking format
JayKL Jun 13, 2019
ec572e8
got gmail backend working
Jun 13, 2019
d344043
implemented front-end functionality for classifications page
markmuwonge Jun 13, 2019
5f6b31d
sequence generator now works for booking
JayKL Jun 13, 2019
e4b3670
finished booking backend
JayKL Jun 13, 2019
9b9a348
got rid of target folder to avoid merge problems
JayKL Jun 13, 2019
cf34111
Merge pull request #22 from H-Yous/dev-branch-booking2
JayKL Jun 13, 2019
f0a4a03
finally sorted contact form out!
Jun 13, 2019
401d2fe
Merge branch 'dev-branch' into dev-branch-gmail-backend
nsmj63 Jun 13, 2019
11b5930
Merge pull request #23 from H-Yous/dev-branch-gmail-backend
nsmj63 Jun 13, 2019
0655072
re-fixed backend project structure and naming conventions
Jun 13, 2019
0b88a2d
re-fixed backend project structure and naming conventions
Jun 13, 2019
66a192c
re-fixed backend project structure and naming conventions
Jun 13, 2019
9341c90
Update README.md
nsmj63 Jun 13, 2019
40e0127
added back readme to fix merge issues
Jun 13, 2019
8021988
updated navbar, added footer, working payments page, added dependcies…
fowusu Jun 13, 2019
61bce5e
merge fix
fowusu Jun 13, 2019
38929f4
Merge pull request #24 from H-Yous/dev-branch-gmail-backend
nsmj63 Jun 13, 2019
d38896a
merge fix
fowusu Jun 13, 2019
34fc43d
fixed merge error
JayKL Jun 14, 2019
759fbcd
merge fix
markmuwonge Jun 14, 2019
e02cff6
merge fix
markmuwonge Jun 14, 2019
e1f6dac
Merge branch 'dev-branch' into dev-branch-classificationspage
markmuwonge Jun 14, 2019
039f68e
Merge pull request #26 from H-Yous/dev-branch-classificationspage
markmuwonge Jun 14, 2019
bdcf192
navbar fix
fowusu Jun 14, 2019
ce9f6db
fixed footer
fowusu Jun 14, 2019
3d3d335
Fixed createScreen propblems
Jun 14, 2019
0e48daf
populates event
JayKL Jun 14, 2019
d6ff220
Merge pull request #27 from H-Yous/dev-branch-autopopulate
JayKL Jun 14, 2019
b14c025
Added seatnum,ticket,price sending functionality
Jun 14, 2019
af2a022
Merge pull request #28 from H-Yous/dev-branch-bookingchart
H-Yous Jun 14, 2019
a2ff49b
improved/fixed contact&directions page, will separate out next
Jun 14, 2019
9f29fb9
Merge branch 'dev-branch' into dev-branch-repagination
nsmj63 Jun 14, 2019
48eb179
Merge pull request #29 from H-Yous/dev-branch-repagination
nsmj63 Jun 14, 2019
86377d8
fixed breaking backend
Jun 14, 2019
c8059f9
removed dead imports and tidied up backend code slightly
Jun 14, 2019
1fc6ed2
edited footer
fowusu Jun 14, 2019
e7ce6eb
nowshowing back end functionaltiy implemented
markmuwonge Jun 14, 2019
a29c05a
merge fix
fowusu Jun 14, 2019
6c923dd
changes to carousel
fowusu Jun 14, 2019
ba41f63
repaginated directions and contact pages
Jun 14, 2019
bdde9b9
Merge pull request #30 from H-Yous/dev-branch-pagination
nsmj63 Jun 14, 2019
8436d61
Finished redirect to payments page + params
Jun 15, 2019
861021d
Clean up of CreateScreen
Jun 15, 2019
992da77
Merge pull request #31 from H-Yous/dev-branch-chartmanager
H-Yous Jun 15, 2019
6956090
Display ticket on payment page
Jun 15, 2019
15a9ef3
nowshowing front end design implemented
markmuwonge Jun 16, 2019
383cbdc
fixed movie certification error
markmuwonge Jun 16, 2019
187f9df
finished payments page integration
Jun 16, 2019
6ea220a
Merge pull request #32 from H-Yous/dev-branch-tickets-payment
H-Yous Jun 16, 2019
24c85fc
updated payments page
fowusu Jun 17, 2019
124672e
added constants on controller, fixed poster retrieval array error
markmuwonge Jun 17, 2019
9515342
merge fixing
markmuwonge Jun 17, 2019
165070d
Merge pull request #34 from H-Yous/dev-branch-nowshowingmovies
markmuwonge Jun 17, 2019
a66f0fb
changed to wait 10 seconds between request, changed cross origins pat…
markmuwonge Jun 17, 2019
b6bd308
improved payments page
fowusu Jun 17, 2019
170d997
changed component of search bar
JayKL Jun 17, 2019
8c7f3b6
added nicks fix
JayKL Jun 17, 2019
37328d3
added constructer to navigation abr
JayKL Jun 17, 2019
d18f244
Completed ChartEven creator + price constants
Jun 17, 2019
d929922
Fixed project folders for this branch
Jun 17, 2019
541fd82
Merge pull request #36 from H-Yous/dev-branch-chart-backend
H-Yous Jun 17, 2019
fa26988
Slight change to eventKey config + fixed minor path call errors
Jun 17, 2019
459863b
managed to make a list of all the movie titles
JayKL Jun 17, 2019
9aa1794
Merge pull request #37 from H-Yous/dev-branch-chart-backend
H-Yous Jun 17, 2019
60ea873
managed to solve the storing of variable problem! :)
JayKL Jun 17, 2019
c719b52
Merge pull request #39 from H-Yous/dev-branch-nowshowingmovies
markmuwonge Jun 17, 2019
9b5ac73
fixed database collection duplication error, need to fix the multiple…
JayKL Jun 17, 2019
e98ab4c
added navbar/footer icons
Jun 17, 2019
8fef290
added confirmation page
fowusu Jun 17, 2019
b5566ba
Merge branch 'dev-branch' of https://github.com/H-Yous/QAGroupProject…
fowusu Jun 17, 2019
472aac0
confirmation
fowusu Jun 17, 2019
989749a
front end gallery in place
markmuwonge Jun 17, 2019
4d5d8f2
trying to figure out how to work with the search bar
JayKL Jun 17, 2019
8412d82
added background image - needs work
Jun 17, 2019
dd5b4fc
Merge branch 'dev-branch' into dev-branch-design
nsmj63 Jun 17, 2019
956e95a
Merge pull request #40 from H-Yous/dev-branch-design
nsmj63 Jun 17, 2019
882b34a
I FIXED IT
Jun 17, 2019
b1878a0
created seperate start up classes for populating certifications, new …
markmuwonge Jun 17, 2019
eebb78c
Merge branch 'dev-branch' into dev-branch-newreleases
markmuwonge Jun 18, 2019
db8f1cd
Merge pull request #41 from H-Yous/dev-branch-newreleases
markmuwonge Jun 18, 2019
4abf6a9
changed checkout
fowusu Jun 18, 2019
f4277a1
finally fixed searchbar
JayKL Jun 18, 2019
2a031f9
redesigned several pages, still needs optimising
Jun 18, 2019
e364422
fixed application loading times
JayKL Jun 18, 2019
581e919
merging dev-searchbar in
JayKL Jun 18, 2019
0883f5e
finished screens page fully
Jun 18, 2019
ac80aad
merge fix
JayKL Jun 18, 2019
750e89c
completed classifications page
Jun 18, 2019
ee72f0d
merge fixing
JayKL Jun 18, 2019
f4cfe31
fixing
JayKL Jun 18, 2019
7636ac9
fixed package-lock.json
JayKL Jun 18, 2019
58301a1
fixed contacts page
Jun 18, 2019
8a35693
css was bugging me
Jun 18, 2019
a2ae591
removed tat
Jun 18, 2019
c576701
Merge branch 'dev-branch' into dev-branch-design2
nsmj63 Jun 18, 2019
626cff3
Merge pull request #43 from H-Yous/dev-branch-design2
nsmj63 Jun 18, 2019
a80dd0e
fixed breaking frontend issues
Jun 18, 2019
6e4dacf
fixed various css issues & added more classification functionality
Jun 18, 2019
96aab81
added framework links
Jun 18, 2019
a1320c5
fixed classification issues on now showing page
Jun 18, 2019
0d7b65b
confirmation
fowusu Jun 18, 2019
d603071
merge fix
fowusu Jun 18, 2019
58db738
this one works lol
Jun 18, 2019
aa7b2bf
check if it works here first
Jun 18, 2019
5b74d23
added Jay's population fix and Mark's nowShowing fix & functionality
Jun 18, 2019
28e9a6e
added Humza's booking functionality
Jun 18, 2019
2acad49
as done as it possibly can be before the final dev day
Jun 18, 2019
2b6f128
Fixed errors + made link from nowshowing -> booking + created ticket …
Jun 18, 2019
d5dc819
Finished Booking a ticket user journey
Jun 19, 2019
d3f9abc
Merge pull request #46 from H-Yous/dev-branch-working-booking-object
H-Yous Jun 19, 2019
b26c4ab
searchbar fix
JayKL Jun 19, 2019
f3347db
Merge pull request #47 from H-Yous/dev-branch-working-searchbarfixing
JayKL Jun 19, 2019
ec319ad
removed extraneous content, tidied up
Jun 19, 2019
622707a
Added classifications+homepage+screens+newreleases tests
Alizahid11 Jun 19, 2019
c422bbf
removed more extraneous files
Jun 19, 2019
1e06659
Merge branch 'dev-branch-actually-working' into dbaw-css
nsmj63 Jun 19, 2019
112c2ec
Merge pull request #48 from H-Yous/dbaw-css
nsmj63 Jun 19, 2019
842f00c
Merge pull request #49 from H-Yous/dbaw-tests
nsmj63 Jun 19, 2019
a5aca5d
Fixed errors with booking seats -- 2/3 bookings work perfectly
Jun 19, 2019
dc4a885
Merge pull request #50 from H-Yous/dev-branch-working-booking-object
H-Yous Jun 19, 2019
fdc5daf
streamlined back-end, added necessary front end
markmuwonge Jun 19, 2019
e91d597
Merge pull request #51 from H-Yous/dev-branch-actually-working-nowsho…
markmuwonge Jun 19, 2019
48c9a13
added paths for search bar
markmuwonge Jun 19, 2019
415b766
refactored front and backend before fix
Jun 19, 2019
9648e32
fixed search bar and new releases page issues
Jun 19, 2019
6adfff8
sorted out newreleases/nowshowinginfo
Jun 19, 2019
18a72fe
fixed yet more merge-related fudgery
Jun 19, 2019
e55ed81
added Mark's altPoster stuff, will add to this later
Jun 19, 2019
5cb27c7
fixed yet more css errors
Jun 19, 2019
8510286
added both posters, with potential for more(?)
Jun 19, 2019
ea01d2b
Finished creating ticket+booking, works in POSTMAN will test very soo…
Jun 19, 2019
44ea081
Fixed and Tested Booking object+creating ticket in front-end--- COMPL…
Jun 20, 2019
94bbf1b
Final commit for booking function
Jun 20, 2019
deff227
fixed and thoroughly tested DP1000 bookings, all working!
Jun 20, 2019
435acd4
pushes events up to database in an array in now showing
JayKL Jun 20, 2019
9ccb128
buttons turn up on frontend
JayKL Jun 20, 2019
0906f54
pushes through fronted
JayKL Jun 20, 2019
e3410f3
more fixing before presentation
JayKL Jun 20, 2019
87f447a
fixed the entire frontend and got buttons working completely with Jay…
Jun 20, 2019
568592a
final minor fixes
Jun 21, 2019
ce4cd12
most recent attempts
JayKL Jun 21, 2019
74149e3
merge fix
JayKL Jun 21, 2019
44cb468
fixed error
JayKL Jun 22, 2019
b912f20
integrated front end to Humzas and mine backend
JayKL Jun 22, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added .DS_Store
Binary file not shown.
15 changes: 15 additions & 0 deletions .classpath
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry exported="true" kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="src" path="frontend-sprint-1/node_modules/react-native/ReactAndroid/src/androidTest/java"/>
<classpathentry kind="src" path="frontend-sprint-1/node_modules/react-native/ReactAndroid/src/main/java"/>
<classpathentry kind="src" path="frontend-sprint-1/node_modules/react-native/ReactAndroid/src/test/java"/>
<classpathentry kind="src" path="frontend-sprint-1/node_modules/react-native/template/android/app/src/main/java"/>
<classpathentry kind="src" path="working-backend-sprint1/src/main/java"/>
<classpathentry kind="src" path="working-backend-sprint1/src/test/java"/>
<classpathentry exported="true" kind="lib" path="frontend-sprint-1/node_modules/react-native/android/com/facebook/react/react-native/0.59.9/react-native-0.59.9-javadoc.jar"/>
<classpathentry exported="true" kind="lib" path="frontend-sprint-1/node_modules/react-native/android/com/facebook/react/react-native/0.59.9/react-native-0.59.9-sources.jar"/>
<classpathentry exported="true" kind="lib" path="frontend-sprint-1/node_modules/react-native/ReactAndroid/src/main/third-party/java/buck-android-support/buck-android-support.jar"/>
<classpathentry kind="lib" path="frontend-sprint-1/node_modules/react-native/template/android/gradle/wrapper/gradle-wrapper.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
/bin/
/src/main/java/com/qa/qacinemas/constants/Constants.java
23 changes: 23 additions & 0 deletions .project
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>QAGroupProject</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.wst.validation.validationbuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
</natures>
</projectDescription>
7 changes: 7 additions & 0 deletions .settings/.jsdtscope
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary"/>
<classpathentry kind="src" path=""/>
<classpathentry kind="output" path=""/>
</classpath>
1 change: 1 addition & 0 deletions .settings/org.eclipse.wst.jsdt.ui.superType.container
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
org.eclipse.wst.jsdt.launching.JRE_CONTAINER
1 change: 1 addition & 0 deletions .settings/org.eclipse.wst.jsdt.ui.superType.name
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Global
Binary file added Architecture.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
213 changes: 165 additions & 48 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,74 +1,191 @@
# QAGroupProject

- [QAGroupProject](#qagroupproject)
* [Introduction](#introduction)
* [Setup](#setup)
* [Java Backend](#java-backend)
+ [Structure](#structure)
- [Packages](#packages)
- [Classes](#classes)
- [Interfaces](#interfaces)
- [Methods](#methods)
* [React Frontend](#react-frontend)
* [List of Tests](#list-of-tests)
* [Current Todo list for readme](#current-todo-list-for-readme)
# QAGroupProject - dev-branch

* [Introduction](#introduction)
* [Setup](#setup)
+ [Windows Installation](#windows-installation)
+ [Backend Setup](#backend-setup)
+ [Frontend Setup](#frontend-setup)
+ [Run Local Instance](#run-local-instance)
+ [Run Network Instance](#run-network-instance)
+ [Run Stripe Server](#run-stripe-server)
* [Java Backend](#java-backend)
+ [Structure](#structure)
- [Packages](#packages)
- [Classes](#classes)
- [Methods](#methods)
* [React Frontend](#react-frontend)
* [List of Tests](#list-of-tests)
* [Current Todos](#current-todos)

## Introduction
This is a group project by Ali, Farhan, Humza, Jay, Mark, and Nick. The project itself is a cinema website with CRUD functionality to a persistent MongoDB database, Spring Boot backend and React frontend. A link to the backlog is given by [Atlassian](https://qacacademypurple.atlassian.net/secure/RapidBoard.jspa?rapidView=29&projectKey=CL2&view=planning.nodetail&selectedIssue=CL2-5).
This is a full-stack application of a cinema website created for [QA Consulting](https://consulting.qa.com/) with CRUD functionality created by Ali, Farhan, Humza, Jay, Mark, and Nick. This system is built with the following technologies:

- [Spring boot](https://spring.io/projects/spring-boot) for the backend.

- [ReactJS](https://reactjs.org/) for the frontend.

- [MongoDB](https://www.mongodb.com/) for the database.

A link to the backlog is given by [Atlassian](https://qacacademypurple.atlassian.net/secure/RapidBoard.jspa?rapidView=29&projectKey=CL2&view=planning.nodetail&selectedIssue=CL2-5).

Image displaying the Architecture
![alt text](https://github.com/H-Yous/QAGroupProject/blob/dev-branch/Architecture.png)

## Setup
Install springboot and maven. Download from git. You will also need to install node.js on your system.
## npm Setup
Clone this repository to a folder.
### Windows Installation
Go to this website [node](https://nodejs.org/en/) and download the installer. Check node is installed
```
node -v
```

Check npm is installed
```
npm -v
```

Update npm to the latest version
```
npm install npm@latest -g
```

### Backend Setup
Go to the folder which you cloned from git hub and into the working-backend-sprint1 folder

```
cd working-backend-sprint1
```

Next build the package

```
mvn package
```

The command line needs to tell you the build was a success

![alt text](https://github.com/H-Yous/QAGroupProject/blob/dev-branch/buildsuccess.PNG)

Go into the target folder

```
cd target
```

Finally run the jar file created using java

```
java -jar QACinemasAID-0.0.1.jar
```

## Frontend Setup
Open the command line in the root directory of the application:
```
npm install --save bootstrap
npm install --save reactstrap react react-dom
npm install react-scripts
cd qacinemas
npm install
```
#### Run a local instance

#### Run local instance
```
cd qacinemas
npm start
```
will open a local instance at `http:\\localhost:5000`.
#### Run local and network instances
#### Run network instance
```
npm run build
npm install -g serve
npx serve -s build
```
will open a local instance at `http:\\localhost:5000` and a network instance at `%YOUR_NETWORK_IP%:5000`.
> Proposed Project Structure, NOT FINAL
#### Run Stripe server
```
npm install react-stripe-elements
npm install express body-parser stripe
node server.js
```
## Java Backend
### Structure
#### Packages
* qacinemas
* qacinemas.main
* qacinemas.models
* qacinemas.repository
* qacinemas.service
* qacinemas.control
* qacinemas.test
* com.qa.cinemas
* .constants
* .controller
* .domain
* .enums
* .repository
* .service
* com.qa.resources
* com.qa.test
#### Classes
* [x] Movie
* [x] MovieController
* [ ] CinemaController
* [ ] ScreenController
* [ ] UserController
* [ ] CinemaRepo
* [ ] ScreenRepo
* [ ] UserRepo
* [ ] CinemaScreen
* [ ] CinemaUser
#### Interfaces
* [ ] ConstantsInterface
* [x] MovieRepository
* [x] ApplicationStartup
* [x] QACinemasApp
* [x] .constants
* [x] PROJ_CONSTANTS
* [x] Constants (encrypted) (requires fix)
* [x] .controller
* [x] BookingController
* [x] CertificationController
* [x] ContactEmailController
* [x] EventController
* [x] MovieController
* [x] NewReleaseMovieController
* [x] NowShowingMovieController
* [x] UpcomingMovieController
* [x] .domain
* [x] Booking
* [x] Certification
* [x] ContactEmail
* [x] DatabaseSequence
* [x] Events
* [x] Movie
* [x] NewReleaseMovie
* [x] NowShowingMovie
* [x] UpcomingMovie
* [x] .enums
* [x] DayTypes
* [x] ScreenType
* [x] ShowSlots
* [x] .repository
* [x] BookingRepository
* [x] CertificationRepository
* [x] ContactEmailRepository
* [x] EventRepository
* [x] MovieRepository
* [x] NewReleaseMovieRepository
* [x] NowShowingMovieRepository
* [x] UpcomingMovieRepository
* [x] .service
* [x] BookingService
* [x] BookingServiceImpl
* [x] CertificationService
* [x] CertificationServiceImpl
* [x] ContactEmailService
* [x] ContactEmailServiceImpl
* [x] EventService
* [x] EventServiceImpl
* [x] MovieService
* [x] MovieServiceImpl
* [x] NewReleaseMovieService
* [x] NewReleaseMovieServiceImpl
* [x] NowShowingMovieService
* [x] NowShowingMovieServiceImpl
* [x] UpcomingMovieService
* [x] UpcomingMovieServiceImpl
* [x] generateShowSequence
* [x] .resources
* [x] application.properties
* [x] .test
* [x] MovieControllerTest
* [x] pom.xml
* [x] settings.xml
#### Methods
> TBD, proposed Project Structure, NOT FINAL
## React Frontend
>TBD
## List of Tests
## Current Todo list for readme
- [x] create empty application with MongoDB/Spring/React/Bootstrap structure
* MovieControllerTest [explain what this does]
## Current Todos
- [ ] full setup guide
- [ ] finalised Project Structure
- [ ] explain EVERY class
- [ ] explain EVERY method
- [ ] explain ALL tests done to ensure product quality and functionality
- [ ] explain EVERY test (frontend w/JUnit+Mockito, backend w/Selenium)

Binary file added buildsuccess.PNG
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
23 changes: 23 additions & 0 deletions frontend-sprint-1/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.

# dependencies
/node_modules
/.pnp
.pnp.js

# testing
/coverage

# production
/build

# misc
.DS_Store
.env.local
.env.development.local
.env.test.local
.env.production.local

npm-debug.log*
yarn-debug.log*
yarn-error.log*
Loading