Skip to content

Milestone_3

Latest
Compare
Choose a tag to compare
@cartwatson cartwatson released this 30 Mar 01:37
· 274 commits to main since this release
bb0bfa3
Milestone_3 (#53)

* added sprintplanning doc

* updated retro template

* Created apps

* updated home page with link to search, created css colors, needs more beuatifying later

* friday standup

* updated global components

* installed customer app in settings

* Working profile page on 'profile/'

* Made the html more 'Vue'y

* It might look ugly but the code looks nice

* Refactored some of the base.html

* Some class changes

* Many files edited to accomodate search for res page

* removed empty file

* Removed commented out code

* Forgot one merge conflict

* Started pass change page

* Everything working now

* Simple password reset done:

* Added csrf token

* Created new folder for profile tabs

* Messed around with Vue Router

* Configured a base URL

* updated documentation

* Small template changes

* Added some comments

* added footer

* added color to border columns, updated home page so footer appears correctly

* Added ability to transfer money to account

* Changed view returns

* added leavitt's linkedin

* Storing and serving car pics working
Accoring to the docs at https://docs.djangoproject.com/en/4.1/howto/static-files/#serving-files-uploaded-by-a-user-during-development
this method is not 'appropriate' for production, only development.
We might have to end up changing this

* Now able to see userprofile in admin page

* Applied changes to car model

* Added employee portal page
- Accessed by '/employee/'
Refactored profile.html into tabs.html for reusage
Changed tab styling

* Refactored employee to 'staff'
Mostly so I didn't have to make another tab screen for Managers

* Added dropdown to navbar

* Message fix for unauth'd user

* Changed 'id' to 'url' cause it makes more sense

* Added get/set methods to auth_level and balance

* Model getters/setters are not common practice

* Small change to try/except block

* added todays standup

* Added full_clean() to view

* sticky footer

* Files edited for reservation model functionality

* Update urls.py

* Fixed error occurring upon migration

* Reservation page mostly working

* updated with today's standup and retrospective

* Removed pay history

* added button to home page, created cards for available cards

* removed white background

* Password change page working

* updated with todays standup

* updated with today's standup

* Reservation page testing/confirm res not working

* new fancy buttons! and logo

* Fixed buttons

* fixed class names, updated footer

* Async post instead of post

* Page working properly
Still need to submit reservation to db
Slightly changed res model to make field names standard
Made request to check availability a GET request instead of POST

* Reservations are now saved to db
Unconfirmed reservations will be invalidated after 10 minutes

* updated buttons and added logo above navbar, styled footer

* Unconfirmed reservations now deleted upon logout

* Confirmation page working

* Confirm page now actually confirms

* Now handles user balance when making res
For now, user is sent to search page with error msg
if insufficient funds, and the reservation is deleted

* Accidentally broke addbalance
Made profile tabs url handling better

* Removed problematic comments from importmap

* todays standup

* todays standup

* updated minor styles

* folder for unit tests

* updated docs

* Linux issue

---------

Co-authored-by: cmax <a02335780@usu.edu>
Co-authored-by: Joe <50468325+jeonix@users.noreply.github.com>
Co-authored-by: jeonix <a01909144@aggies.usu.edu>
Co-authored-by: Caden Maxwell <cadenr.maxwell@gmail.com>
Co-authored-by: caden-maxwell <109488523+caden-maxwell@users.noreply.github.com>