Code

Feedback#1

Code

Open

github-classroom[bot] wants to merge 158 commits intofeedbackSAEBelgradeWeb/wbd6204-web-application-nlukic97:feedbackfrom masterSAEBelgradeWeb/wbd6204-web-application-nlukic97:masterCopy head branch name to clipboard

+95,961-1

Commits

Commits on Mar 2, 2021

• Setting up GitHub Classroom Feedback

  github-classroom[bot]

  authored
  6c4c936

  Copy full SHA for 6c4c936

• first commit

  nlukic97

  committed
  ed8aa58

  Copy full SHA for ed8aa58

• first commit

  nlukic97

  committed
  0e073f2

  Copy full SHA for 0e073f2

Commits on Mar 3, 2021

• readme draft 1

  nlukic97

  committed
  2b9c910

  Copy full SHA for 2b9c910

Commits on Mar 4, 2021

• readme 2

  nlukic97

  committed
  4b37eb4

  Copy full SHA for 4b37eb4

Commits on Mar 11, 2021

• vue ui and authentication added

  nlukic97

  committed
  5daa92d

  Copy full SHA for 5daa92d

Commits on Mar 13, 2021

• package.json updated

  nlukic97

  committed
  be5e38e

  Copy full SHA for be5e38e

• adding migrations

  nlukic97

  committed
  07046ef

  Copy full SHA for 07046ef

• users and location migration, seeder, and relationship

  nlukic97

  committed
  70b9381

  Copy full SHA for 70b9381

• foreign key user location

  nlukic97

  committed
  5c8328c

  Copy full SHA for 5c8328c

• friendships displaying. Not sure how to make registration work with the new fields I made - so many of the user migration fields have been set to nullable, must be changed later.

  nlukic97

  committed
  201b57f

  Copy full SHA for 201b57f

• registration works - I want to optimize it so it asks the user for [age, sex, location, and image_url] after first registration.

  nlukic97

  committed
  c1ed316

  Copy full SHA for c1ed316

• somethin

  nlukic97

  committed
  3bce9db

  Copy full SHA for 3bce9db

• Merge pull request #26 from SAEBelgradeWeb/making_migrations

  Show description for bd99722
  nlukic97

  authored
  bd99722

  Copy full SHA for bd99722

Commits on Mar 15, 2021

• migrations and seeding for events, locations, courts, event_user...

  nlukic97

  committed
  ce6eb8a

  Copy full SHA for ce6eb8a

• more migrations and seeding

  nlukic97

  committed
  aa787ee

  Copy full SHA for aa787ee

• payments migration and seeder

  nlukic97

  committed
  a839b8a

  Copy full SHA for a839b8a

• commenting the Payment Seeder

  nlukic97

  committed
  3a9e02d

  Copy full SHA for 3a9e02d

Commits on Mar 16, 2021

• made EventUser and Friendship statuses be enum with three possible values. Also, sorted out registration form a bit. Still must make select options for locations

  nlukic97

  committed
  d2c13c8

  Copy full SHA for d2c13c8

Commits on Mar 17, 2021

• registration form works. Check it out later, QA.

  nlukic97

  committed
  cdcb627

  Copy full SHA for cdcb627

Commits on Mar 22, 2021

• validation for sex and locations done. Autofill for both also done. May need to remove some unecessary fields in the HTML tags of those two. Also, error messages do not go away when a user clicks o…

  Show description for 7819709
  nlukic97

  committed
  7819709

  Copy full SHA for 7819709

• displaying users data to him in settings. Must add image upload somehow

  nlukic97

  committed
  4b0acdf

  Copy full SHA for 4b0acdf

Commits on Mar 23, 2021

• /myAccount route calls user controller. Also, added page for editing user data, but may go with an axios post instead.

  nlukic97

  committed
  152e8d6

  Copy full SHA for 152e8d6

Commits on Mar 24, 2021

• UI of users profile (must make vue components for certaing things). The foreignId constraint does not allow adding new friendships - only data entered from seeder(user_id's) can be adde din the fri…

  Show description for beec244
  nlukic97

  committed
  beec244

  Copy full SHA for beec244

• made some components out of the user profile page. Still have to add ratings(much later down the line). Profile picture is displayed for two sexes if they haven't added one themselves already.

  nlukic97

  committed
  6840ed7

  Copy full SHA for 6840ed7

• font awesome added. Profile page responsive, still have to make it look better

  nlukic97

  committed
  47471de

  Copy full SHA for 47471de

• unable to import a component (profileModal) into another component (profileContent)

  nlukic97

  committed
  20af6d4

  Copy full SHA for 20af6d4

Commits on Mar 25, 2021

• initial modal made

  nlukic97

  committed
  69da3fb

  Copy full SHA for 69da3fb

• having issues with closing the modal (prop mutation)

  nlukic97

  committed
  4d20412

  Copy full SHA for 4d20412

• problems...

  nlukic97

  committed
  e54640f

  Copy full SHA for e54640f

• sorted out the modal - no console errors with the props.

  nlukic97

  committed
  14b2250

  Copy full SHA for 14b2250

Commits on Mar 26, 2021

• the data is processed on the AboutProfileModal. Just to make the POST request to insert new data to the database

  nlukic97

  committed
  7b82736

  Copy full SHA for 7b82736

Commits on Mar 28, 2021

• saving progress with api post request

  nlukic97

  committed
  24fb156

  Copy full SHA for 24fb156

• testing auth

  nlukic97

  committed
  36fe85b

  Copy full SHA for 36fe85b

• axios push working. Still have to add authentication

  nlukic97

  committed
  707ea64

  Copy full SHA for 707ea64

• updating age, sex and city fully work. Password is next. Must add authentication for API's

  nlukic97

  committed
  1797bff

  Copy full SHA for 1797bff

• Merge pull request #36 from SAEBelgradeWeb/api-auth

  Show description for 9b56c89
  nlukic97

  authored
  9b56c89

  Copy full SHA for 9b56c89

• the user id is forwarded to the views in order to make the post axios request to change their data

  nlukic97

  committed
  109f408

  Copy full SHA for 109f408

• removed the id prop passed to the vue - the controllers recognize Auth::user()->id when passport is used for api post and get requests

  nlukic97

  committed
  f06229d

  Copy full SHA for f06229d

• sorting out the editing of the bio section

  nlukic97

  committed
  5d1f50e

  Copy full SHA for 5d1f50e

• added user bio from database

  nlukic97

  committed
  86341ce

  Copy full SHA for 86341ce

• still working on the user bio section. Displaying text and button properly.

  nlukic97

  committed
  6483aa1

  Copy full SHA for 6483aa1

Commits on Mar 29, 2021

• design for bio add/edit improved. Small screen sizes supported

  nlukic97

  committed
  b0ecf91

  Copy full SHA for b0ecf91

• apo post request not working. userController & ProfileBio.vue

  nlukic97

  committed
  3aa5211

  Copy full SHA for 3aa5211

• fixed the issue with the biography post description. The backend does not allow the update method to be used for some reason. Now I have to add an 'edit bio' button

  nlukic97

  committed
  ab1c337

  Copy full SHA for ab1c337

• able to submit null to the database. Upon load, having null in the bio will display 'add bio' button. Having anything in the bio will display that text. Next ---> add edit button and options

  nlukic97

  committed
  a925283

  Copy full SHA for a925283

• figuring out logic for bio edit/ submit/ remove

  nlukic97

  committed
  f165f50

  Copy full SHA for f165f50

Commits on Mar 30, 2021

• fixed the small bug. I had to add 'bio' to the $fillable array in the User model

  nlukic97

  committed
  bcab449

  Copy full SHA for bcab449

• bio editing section works

  nlukic97

  committed
  e48c014

  Copy full SHA for e48c014

• textbox focus, padding, and size adapted

  nlukic97

  committed
  aa12ecc

  Copy full SHA for aa12ecc

• account-settings blade page created component. Next --> create component, handle new input data, and then return errors if there are any (we could display it as a modal message)

  nlukic97

  committed
  f0842d2

  Copy full SHA for f0842d2

• bio text word break added. Also, sorted out indentation in textarea when editing bio upon page reload

  nlukic97

  committed
  fe3d551

  Copy full SHA for fe3d551

• component for settings created. Validation for age input on profilePage added

  nlukic97

  committed
  fcb5688

  Copy full SHA for fcb5688

• name and username editable

  nlukic97

  committed
  0e338cb

  Copy full SHA for 0e338cb

Commits on Mar 31, 2021

• save button only present if input data is different from the one currently present

  nlukic97

  committed
  e72d10c

  Copy full SHA for e72d10c

• password updating set up. Just to set up the backend

  nlukic97

  committed
  2b60281

  Copy full SHA for 2b60281

• password change works (confirms old password to db, compares new and confirmation pass, and enters into db)

  nlukic97

  committed
  c6c3cdc

  Copy full SHA for c6c3cdc

• from text to password input. Reset password field after submission

  nlukic97

  committed
  bef3bfd

  Copy full SHA for bef3bfd

Commits on Apr 12, 2021

• removing free courts option

  nlukic97

  committed
  ece1541

  Copy full SHA for ece1541

• saving components

  nlukic97

  committed
  3017135

  Copy full SHA for 3017135

• sorted components into folders

  nlukic97

  committed
  20d91cd

  Copy full SHA for 20d91cd

• images working - a forward slash must be added for them to be viewable

  nlukic97

  committed
  1fd4e60

  Copy full SHA for 1fd4e60

• cancel button added to editing data

  nlukic97

  committed
  27162e6

  Copy full SHA for 27162e6

• made modal for image upload

  nlukic97

  committed
  c163470

  Copy full SHA for c163470

• added file reader and validation for it. Next step -> cropping

  nlukic97

  committed
  e6bcac1

  Copy full SHA for e6bcac1

• unable to upload image using FormData api

  nlukic97

  committed
  600ff88

  Copy full SHA for 600ff88

• moving from upload image modal to upload image page. Maybe I can add the vue component, but still to see. The AvatarFormModal has been uncommented from everywhere, it only exists as a file

  nlukic97

  committed
  e7027c3

  Copy full SHA for e7027c3

• file upload set up. Just to sort out backend

  nlukic97

  committed
  4f219cc

  Copy full SHA for 4f219cc

• image upload fully functional. Just have to set up the CSS for the profile picture. Also, check on how to delete the old profile image after adding a new one.

  nlukic97

  committed
  77c28e8

  Copy full SHA for 77c28e8

• new avatar upload - old avatar delete -works. Sort out CSS

  nlukic97

  committed
  464e225

  Copy full SHA for 464e225

Commits on Apr 13, 2021

• fixed api route to be relative rather than absolute

  nlukic97

  committed
  2bae90d

  Copy full SHA for 2bae90d

• able to create a game. Work on the UI for dummy game payment

  nlukic97

  committed
  bcb87d0

  Copy full SHA for bcb87d0

• event creation done. Relationship between event and user made. Relationship between court and location made. and so on

  nlukic97

  committed
  6fc6c7b

  Copy full SHA for 6fc6c7b

• bug with profile picture. The url of viewing another user messed up the filepath. ../ is needed when viewing another persons profile

  nlukic97

  committed
  ffbec2c

  Copy full SHA for ffbec2c

• fixed image upload. Also, the user will now be able to see other pages. But different props are displayed based on whether they are looking at their own page or at a page of anoter user ---> still …

  Show description for f324701
  nlukic97

  committed
  f324701

  Copy full SHA for f324701

• sorting out some stuff. Must work on the friends/{id} route, it only shows my own friends no matter what

  nlukic97

  committed
  102cca2

  Copy full SHA for 102cca2

• added personal timestamps for sorting of the user feed in javascript

  nlukic97

  committed
  ca94e38

  Copy full SHA for ca94e38

• made view for showing other user profiles (non editable ones). Still have to implement the friend-check to change the display of events

  nlukic97

  committed
  e2a9d18

  Copy full SHA for e2a9d18

Commits on Apr 14, 2021

• event page created, results display well. Linkin done, a user can visit the game from their page, and their (and other users) page from the event

  nlukic97

  committed
  01b2a24

  Copy full SHA for 01b2a24

Commits on Apr 17, 2021

• working on displaying friends front-end.

  nlukic97

  committed
  0f803c5

  Copy full SHA for 0f803c5

• issue to deal with later

  nlukic97

  committed
  95ea144

  Copy full SHA for 95ea144

• found solution for the display of friends images. But It might be easier just to crop the image before upload into a centered square.

  nlukic97

  committed
  6dbca8c

  Copy full SHA for 6dbca8c

• sorted out error handling for my vue password change. Still have to display the password errors, check out catch(e) on line 76 in the /userSettings/ChangePassword.vue component

  nlukic97

  committed
  e77e273

  Copy full SHA for e77e273

Commits on Apr 18, 2021

• Event page display logic brainstorming

  nlukic97

  committed
  6c3f4b0

  Copy full SHA for 6c3f4b0

• working on logic for displaying the events based on game status, and user membership to the game. Must include 'game confirmed' check for members and non members, almost there. Optimized the getHos…

  Show description for 571e384
  nlukic97

  committed
  571e384

  Copy full SHA for 571e384

Commits on Apr 19, 2021

• fixed/ optimized the event display logic. Make sure to test it.

  nlukic97

  committed
  9b027f9

  Copy full SHA for 9b027f9

• added some text to better understand what I can do with each event page

  nlukic97

  committed
  934b158

  Copy full SHA for 934b158

• users can join games, and leave them - under certain conditions

  nlukic97

  committed
  8e24c14

  Copy full SHA for 8e24c14

• users join and leave games. admin can cancel games. (both under certain conditions)

  nlukic97

  committed
  194ae6d

  Copy full SHA for 194ae6d

• payment function works for all. Should optimize the join and leave event methods to work with payments...

  nlukic97

  committed
  92e3d3e

  Copy full SHA for 92e3d3e

• if a user visits a page, the server checks if 1. they own the page, or 2. if its a friend page (or not). A different display is shown based on this

  nlukic97

  committed
  eb13437

  Copy full SHA for eb13437

• minor fix in non-friend-user.blade.php

  nlukic97

  committed
  42d0e96

  Copy full SHA for 42d0e96

Commits on Apr 20, 2021

• friendship system almost fully created. Still need to add 'reject request' components. Also, I want to add the status of 'removed' and 'cancelled' to my Friendship tables (when user removes another…

  Show description for ab98777
  nlukic97

  committed
  ab98777

  Copy full SHA for ab98777

Commits on Apr 21, 2021

• removed 'forgot password' option, and overrided the methods in ForgotPasswordController

  nlukic97

  committed
  8b5d228

  Copy full SHA for 8b5d228

• cleaned up seeder - admin is automatically generated with a game set up, with some players and some friends

  nlukic97

  committed
  c46dbb3

  Copy full SHA for c46dbb3

• cleaned up seeder - admin is automatically generated with a game set up, with some players and some friends

  nlukic97

  committed
  82959d2

  Copy full SHA for 82959d2

• cleaned up seeder - admin is automatically generated with a game set up, with some players and some friends

  nlukic97

  committed
  d52fe1d

  Copy full SHA for d52fe1d

• sorted out a bug. Must remove the 'denied' option from the database migration for friendships

  nlukic97

  committed
  1ec551f

  Copy full SHA for 1ec551f

• created component for event data. Now the messages are the only thing left

  nlukic97

  committed
  8e7e2df

  Copy full SHA for 8e7e2df

• fixing bad refactor

  nlukic97

  committed
  bf4acd7

  Copy full SHA for bf4acd7

• displaying messages in the admin view - transfer to others

  nlukic97

  committed
  5334433

  Copy full SHA for 5334433

• displaying messages in the admin view - transfer to others

  nlukic97

  committed
  c6cdefa

  Copy full SHA for c6cdefa

Commits on Apr 22, 2021

• made a v-if, so that if there was a user in a game who had sent a message, the message is still displayed --> but it says 'former member'---> so that the message context would not be lost

  nlukic97

  committed
  96826a3

  Copy full SHA for 96826a3

• components for search of users and events made. Methods for the blade holding these two components also made. APi routes defined but commented out, methods in controllers should still be defined

  nlukic97

  committed
  32f122b

  Copy full SHA for 32f122b

• event filtering added. Must sort the results for specific cities, perhaps I could do this on the client side

  nlukic97

  committed
  2eafaf3

  Copy full SHA for 2eafaf3

• sorting of filtered events finished

  nlukic97

  committed
  bbcf92f

  Copy full SHA for bbcf92f

• search almost finished - should make it into a vue component so I can actually pull the get parameters into the box and checkbox for the user when they make a query

  nlukic97

  committed
  f2dc4fd

  Copy full SHA for f2dc4fd

• fixing bad variable compact

  nlukic97

  committed
  2edcb68

  Copy full SHA for 2edcb68

Commits on Apr 23, 2021

• user search - the searched parameters remain in the boxes when results show up

  nlukic97

  committed
  8bffe73

  Copy full SHA for 8bffe73

• simplified the get parameter displaying to the user

  nlukic97

  committed
  5220116

  Copy full SHA for 5220116

• Able to display the friend accounts of one specific user

  nlukic97

  committed
  0e24dd9

  Copy full SHA for 0e24dd9

• I can see 9 of my friends if i am authenticated in the preview section. Setting it up for when I view a friends propfile...

  nlukic97

  committed
  9e40497

  Copy full SHA for 9e40497

• friendships are now displaying for auth and friend users. Now to make a view to see all friends

  nlukic97

  committed
  6255756

  Copy full SHA for 6255756

• friendlist are working

  nlukic97

  committed
  f57d8eb

  Copy full SHA for f57d8eb

• updating the link to view friendlist, and passing user id as prop to components

  nlukic97

  committed
  8e117dc

  Copy full SHA for 8e117dc

• able to send and receive api post requests for adding messages to an event. Now to do the validation and permissions check

  nlukic97

  committed
  862e7df

  Copy full SHA for 862e7df

• messaging works. Just to add notifications of new messages

  nlukic97

  committed
  3a78c71

  Copy full SHA for 3a78c71

• friendship statuses sorted

  nlukic97

  committed
  141e4f5

  Copy full SHA for 141e4f5

• msg and friendship notifications working fully. Just the event notifications left

  nlukic97

  committed
  557203e

  Copy full SHA for 557203e

Commits on Apr 24, 2021

• notifications sortByDesc('created_at') ---> so most recent one shall be displayed

  nlukic97

  committed
  342d49a

  Copy full SHA for 342d49a

• notifications fully functional

  nlukic97

  committed
  f96bf7f

  Copy full SHA for f96bf7f

• made command to check for all the events

  nlukic97

  committed
  568a41a

  Copy full SHA for 568a41a

• making it up to date

  nlukic97

  committed
  2fdd63d

  Copy full SHA for 2fdd63d

• unit and feature test made

  nlukic97

  committed
  67a8632

  Copy full SHA for 67a8632

• tests made. Now just to make github tests.

  nlukic97

  committed
  1c92d1a

  Copy full SHA for 1c92d1a

• adding tests

  nlukic97

  committed
  4a112da

  Copy full SHA for 4a112da

• changing .yml branch name from main to MASTER

  nlukic97

  committed
  57c598d

  Copy full SHA for 57c598d

• .yml add password

  nlukic97

  committed
  be657ad

  Copy full SHA for be657ad

• changing some things to the .yml file

  nlukic97

  committed
  971476b

  Copy full SHA for 971476b

• laravel tests

  nlukic97

  committed
  0837e97

  Copy full SHA for 0837e97

• laravel action

  nlukic97

  committed
  cca8a58

  Copy full SHA for cca8a58

• Laravel server tests

  nlukic97

  committed
  11f73c2

  Copy full SHA for 11f73c2

• Laravel unit, feature and browser tests.

  nlukic97

  committed
  3ec1102

  Copy full SHA for 3ec1102

• Server setup and tests

  nlukic97

  committed
  1b12f88

  Copy full SHA for 1b12f88

• README.md action badge added

  nlukic97

  committed
  fd90a09

  Copy full SHA for fd90a09

Commits on Apr 25, 2021

• image fit works

  nlukic97

  committed
  369d112

  Copy full SHA for 369d112

• Unread notifications number is displayed to the user next to the notifications card in the top right dropdown - when they visit the notifications page, this number is hidden

  nlukic97

  committed
  4825bb2

  Copy full SHA for 4825bb2

• some styling done

  nlukic97

  committed
  7f349d5

  Copy full SHA for 7f349d5

• made more style changes

  nlukic97

  committed
  b2883bc

  Copy full SHA for b2883bc

• deployment attempt

  nlukic97

  committed
  65da048

  Copy full SHA for 65da048

• deployment try AGAIN

  nlukic97

  committed
  6913a03

  Copy full SHA for 6913a03

• deployment

  nlukic97

  committed
  1d883e4

  Copy full SHA for 1d883e4

Commits on Apr 26, 2021

• testing forge build

  nlukic97

  committed
  c87066b

  Copy full SHA for c87066b

• user search looks better

  nlukic97

  committed
  1030164

  Copy full SHA for 1030164

• the electricity went out for a split second... better safe than sorry

  nlukic97

  committed
  21a5470

  Copy full SHA for 21a5470

• more styling on the event

  nlukic97

  committed
  c4cb1bc

  Copy full SHA for c4cb1bc

• testing the cors policy change

  nlukic97

  committed
  eb0d015

  Copy full SHA for eb0d015

• CORS try 2nd

  nlukic97

  committed
  c2f0e08

  Copy full SHA for c2f0e08

• testing scheduled job

  nlukic97

  committed
  4218ed4

  Copy full SHA for 4218ed4

• changing the file path to be fetched

  nlukic97

  committed
  330133d

  Copy full SHA for 330133d

• changed picture of characters

  nlukic97

  committed
  b6deee6

  Copy full SHA for b6deee6

• new add

  nlukic97

  committed
  bb63227

  Copy full SHA for bb63227

• name change

  nlukic97

  committed
  dde1af7

  Copy full SHA for dde1af7

• Deployment

  nlukic97

  committed
  0e09e50

  Copy full SHA for 0e09e50

Commits on Jun 10, 2021

• fixing image upload bug

  nlukic97

  committed
  8cf7c37

  Copy full SHA for 8cf7c37

• added google analytics tracking tag to the app.blade.php page

  nlukic97

  committed
  01e4b61

  Copy full SHA for 01e4b61

• sorting out website.

  nlukic97

  committed
  6fe0fbb

  Copy full SHA for 6fe0fbb

• forge repo reinstall + google analytics script added to views/layouts/app.blade.php

  nlukic97

  committed
  c92bef8

  Copy full SHA for c92bef8