Commits · 9e8c24fc1b9483a2737761af8251998cc7b06546 · Julia Santos / Hunger Buster

17 Mar, 2021 9 commits
- Updated the css of fridge list view · 9e8c24fc
  Andrea Tsai authored Mar 17, 2021
```
Fixed the sidebar
Note: the dropdown menu for switching views is not yet working
```
  9e8c24fc
- Updated fridge list view · 632375ab
  Andrea Tsai authored Mar 17, 2021
```
Fixed the sidebar
Note: there is no working dropdown menu for switching views yet
```
  632375ab
- Updated css of sidebar scaling and subheader · acbe068d
  Andrea Tsai authored Mar 17, 2021
  
  acbe068d
- Updated sidebar scaling and added subheader (still in progress) · 6caed8e0
  Andrea Tsai authored Mar 17, 2021
  
  6caed8e0
- Added image validation · 66990953
  Julia Santos authored Mar 17, 2021
  
  66990953
- Upload Roboto Regular font file · 5635366c
  Andrea Tsai authored Mar 17, 2021
  
  5635366c
- Upload Roboto Bold font file · 59a60166
  Andrea Tsai authored Mar 17, 2021
  
  59a60166
- Updated sidebar to include image icons · 5596c812
  Andrea Tsai authored Mar 17, 2021
  
  5596c812
- Updated sidebar · c5e6282c
  Andrea Tsai authored Mar 17, 2021
```
Note: Add image id for each icon
```
  c5e6282c
16 Mar, 2021 11 commits
- Merge branch 'Login' into 'master' · 11ef102e
  Julia Santos authored Mar 16, 2021
```
Login

See merge request !3
```
  11ef102e
- Added different sorting views for Product Type, added option to delete items · 41400cd4
  Julia Santos authored Mar 16, 2021
  
  41400cd4
- Integrated sidebar html with django, added css · 4af4656a
  Julia Santos authored Mar 16, 2021
  
  4af4656a
- Upload css file for sidebar + header · d09485d4
  Andrea Tsai authored Mar 16, 2021
  
  d09485d4
- Upload html file for sidebar + header · 5efeb47f
  Andrea Tsai authored Mar 16, 2021
  
  5efeb47f
- Add new directory for html and css files · 4c566a9e
  Andrea Tsai authored Mar 16, 2021
  
  4c566a9e
- Merge branch 'Login' into 'master' · 93fdf3bc
  Julia Santos authored Mar 16, 2021
```
Login

See merge request !2
```
  93fdf3bc
- Users can now only see their own items, and can add items through a form when logged in. · a5e4894e
  Julia Santos authored Mar 16, 2021
  
  a5e4894e
- Implemented logging in function, redirects to homepage · 445200ca
  Julia Santos authored Mar 16, 2021
  
  445200ca
- Merge branch 'Setup2' into 'master' · 6446f90c
  Julia Santos authored Mar 16, 2021
```
Setup2

See merge request !1
```
  6446f90c
- Merge branch 'master' into 'Setup2' · e7431d56
  Julia Santos authored Mar 16, 2021
```
# Conflicts:
#   Breadcrumbs/urls.py
#   manage.py
```
  e7431d56
15 Mar, 2021 1 commit
- First commit, setting up django · df0720f8
  Julia Santos authored Mar 15, 2021
  
  df0720f8