Commits · acfa0f3c418023b50f4da22dbecfc759ec67f653 · Fin Wallis / Tickcrypt

Jan 24, 2022
- Merge branch 'master' into 'main' · acfa0f3c
  Fin Wallis authored 3 years ago
```
Simplifying setup configuration

See merge request !15
```
  acfa0f3c
- Simplifying setup configuration · 41262e2e
  Fin Wallis authored 3 years ago
  
  41262e2e
- Merge branch 'master' into 'main' · 84193729
  Fin Wallis authored 3 years ago
```
Buy tickets, view owned tickets and miscellaneous files added

See merge request !14
```
  84193729
- Users can now see their purchased tickets. Architecture diagrams, project... · 51b27735
  Fin Wallis authored 3 years ago
```
Users can now see their purchased tickets. Architecture diagrams, project requirements, database data imports added
```
  51b27735
Jan 23, 2022
- Purchase now works and card details now save to database · 52401301
  Fin Wallis authored 3 years ago
  
  52401301
Jan 22, 2022
- Added forms for card details, as well as model and change to controller which... · 07c1107a
  Fin Wallis authored 3 years ago
```
Added forms for card details, as well as model and change to controller which now almost saves card details
```
  07c1107a
Jan 21, 2022
- Adding start of purchase window in EventCard with form component configuration similar to signUp · dcd0946d
  Fin Wallis authored 3 years ago
  
  dcd0946d
Jan 20, 2022
- added event checout modal according to what evn · 4f1f5efc
  Fin Wallis authored 3 years ago
  
  4f1f5efc
Jan 18, 2022
- fixed showing events based on event card size · 0c0eebe2
  Fin Wallis authored 3 years ago
  
  0c0eebe2
Jan 17, 2022
- Adding type prop to event card to indicate whether small event or large event card should be shown · 6745540b
  Fin Wallis authored 3 years ago
  
  6745540b
Jan 15, 2022
- Events can now be added to db using create event page · 15340295
  Fin Wallis authored 3 years ago
  
  15340295
Jan 14, 2022
- Adding event card component to display all individual events on marketplace · d2abcc26
  Fin Wallis authored 3 years ago
  
  d2abcc26
Jan 12, 2022
- getting all events for marketplace · 1e01307e
  Fin Wallis authored 3 years ago
  
  1e01307e
Jan 10, 2022
- added index.js to backend/models in order to allow getting data on users and events · 21f1bc9f
  Fin Wallis authored 3 years ago
  
  21f1bc9f
Jan 09, 2022
- Merge branch 'master' into 'main' · 473b5aba
  Fin Wallis authored 3 years ago
```
Master

See merge request !13
```
  473b5aba
- resolved gitignore · 1feef938
  Fin Wallis authored 3 years ago
  
  1feef938
- removing node modules · db3869c1
  Fin Wallis authored 3 years ago
  
  db3869c1
Jan 02, 2022
- Merge branch 'main' of https://git.cardiff.ac.uk/c1843476/tickcrypt · 06287730
  Fin Wallis authored 3 years ago
  
  06287730
- added create event authenticator, create event validation, event form state and event post routing · 016dd0a1
  Fin Wallis authored 3 years ago
  
  016dd0a1
Dec 27, 2021
- Merge branch 'master' into 'main' · fda7e022
  Fin Wallis authored 3 years ago
```
added login credentials error alert and create event form component

See merge request !12
```
  fda7e022
- added login credentials error alert and create event form component · d2df4312
  Fin Wallis authored 3 years ago
  
  d2df4312
Dec 26, 2021
- Merge branch 'master' into 'main' · 67d4e4da
  Fin Wallis authored 3 years ago
```
added protected routes and logout

See merge request !11
```
  67d4e4da
- added protected routes and logout · 889d8efe
  Fin Wallis authored 3 years ago
  
  889d8efe
Dec 24, 2021
- Merge branch 'master' into 'main' · 54811eb2
  Fin Wallis authored 3 years ago
```
re-configured routing to react router v6

See merge request !10
```
  54811eb2
- re-configured routing to react router v6 · 87b67988
  Fin Wallis authored 3 years ago
  
  87b67988
- Merge branch 'master' into 'main' · 337b4fa2
  Fin Wallis authored 3 years ago
```
added storing of cookie and local storage data on login

See merge request !9
```
  337b4fa2
Dec 23, 2021
- added storing of cookie and local storage data on login · d83cac2f
  Fin Wallis authored 3 years ago
  
  d83cac2f
Dec 22, 2021
- Merge branch 'master' into 'main' · ab01d277
  Fin Wallis authored 3 years ago
```
added JWT token return on validated login

See merge request !8
```
  ab01d277
- added JWT token return on validated login · d13f9ad4
  Fin Wallis authored 3 years ago
  
  d13f9ad4
Dec 21, 2021
- Merge branch 'master' into 'main' · c48087c1
  Fin Wallis authored 3 years ago
```
fixing deleted app.css error

See merge request !7
```
  c48087c1
- fixing deleted app.css error · 63cc3a67
  Fin Wallis authored 3 years ago
  
  63cc3a67
- Merge branch 'master' into 'main' · ef8c208d
  Fin Wallis authored 3 years ago
```
new users signing up now save to the database

See merge request !6
```
  ef8c208d
- new users signing up now save to the database · 6b4bb817
  Fin Wallis authored 3 years ago
  
  6b4bb817
- Merge branch 'master' into 'main' · 5e601955
  Fin Wallis authored 3 years ago
```
Master

See merge request !5
```
  5e601955
- Merge branch 'master' of https://git.cardiff.ac.uk/c1843476/tickcrypt · dd9b854f
  Fin Wallis authored 3 years ago
  
  dd9b854f
- Implemented backend express signup form validation · ba6c2189
  Fin Wallis authored 3 years ago
  
  ba6c2189
Dec 20, 2021
- Merge branch 'master' into 'main' · d0684bb0
  Fin Wallis authored 3 years ago
```
adding gitignore change

See merge request !4
```
  d0684bb0
- Merge branch 'main' into 'master' · 5b49d90e
  Fin Wallis authored 3 years ago
```
# Conflicts:
#   Backend/.gitignore
```
  5b49d90e
- adding gitignore change · fe34cdbd
  Fin Wallis authored 3 years ago
  
  fe34cdbd
- Update .gitignore · a3184f21
  Fin Wallis authored 3 years ago
  
  a3184f21