diff --git a/one_trip/lib/screens/home_screen.dart b/one_trip/lib/screens/home_screen.dart index baca9de..aa51075 100644 --- a/one_trip/lib/screens/home_screen.dart +++ b/one_trip/lib/screens/home_screen.dart @@ -18,7 +18,7 @@ class _HomeScreenState extends State { "Shopping List", "Saved Recipes", "Your Profile", - "Color Debug" + // "Color Debug" ]; @override @@ -27,7 +27,7 @@ class _HomeScreenState extends State { const ListPage(), const RecipesPage(), const ProfilePage(), - const ColorPage() + // const ColorPage() ]; super.initState(); } @@ -58,11 +58,11 @@ class _HomeScreenState extends State { label: "Profile", backgroundColor: Theme.of(context).colorScheme.secondaryContainer, ), - BottomNavigationBarItem( - icon: const Icon(Icons.grid_3x3), - label: "Colors", - backgroundColor: Theme.of(context).colorScheme.secondaryContainer, - ) + // BottomNavigationBarItem( + // icon: const Icon(Icons.grid_3x3), + // label: "Colors", + // backgroundColor: Theme.of(context).colorScheme.secondaryContainer, + // ) ], currentIndex: _selectedPage, onTap: (value) { diff --git a/one_trip_api/daphne.service b/one_trip_api/daphne.service new file mode 100644 index 0000000..9d9fa2c --- /dev/null +++ b/one_trip_api/daphne.service @@ -0,0 +1,16 @@ +[Unit] +Description=daphne daemon +After=network.target + +[Service] +User=django +Group=www-data +Environment="DJANGO_RELEASE=True" +WorkingDirectory=/opt/django/OneTrip/one_trip_api +ExecStart=/opt/django/OneTrip/one_trip_api/venv/bin/daphne \ + --u /run/daphne/daphne.sock \ + one_trip_api.asgi:application + +[Install] +WantedBy=multi-user.target + diff --git a/one_trip_api/gunicorn.service b/one_trip_api/gunicorn.service deleted file mode 100644 index 6d45976..0000000 --- a/one_trip_api/gunicorn.service +++ /dev/null @@ -1,18 +0,0 @@ -[Unit] -Description=gunicorn daemon -Requires=gunicorn.socket -After=network.target - -[Service] -User=django -Group=www-data -Environment="DJANGO_RELEASE=True" -WorkingDirectory=/opt/django/OneTrip/one_trip_api -ExecStart=/opt/django/OneTrip/one_trip_api/venv/bin/gunicorn \ - --access-logfile - \ - --workers 3 \ - --bind unix:/run/gunicorn.sock \ - one_trip_api.wsgi:application - -[Install] -WantedBy=multi-user.target \ No newline at end of file diff --git a/one_trip_api/gunicorn.socket b/one_trip_api/gunicorn.socket deleted file mode 100644 index cc9bfee..0000000 --- a/one_trip_api/gunicorn.socket +++ /dev/null @@ -1,8 +0,0 @@ -[Unit] -Description=gunicorn socket - -[Socket] -ListenStream=/run/gunicorn.sock - -[Install] -WantedBy=sockets.target \ No newline at end of file diff --git a/planning/backend-structure.dia b/planning/backend-structure.dia index 7d96231..912d771 100644 Binary files a/planning/backend-structure.dia and b/planning/backend-structure.dia differ diff --git a/planning/backend-structure.png b/planning/backend-structure.png new file mode 100644 index 0000000..d4d9e6b Binary files /dev/null and b/planning/backend-structure.png differ diff --git a/readme.md b/readme.md new file mode 100644 index 0000000..7d18122 --- /dev/null +++ b/readme.md @@ -0,0 +1,52 @@ +# One Trip + +## Technologies Used + +### Backend +- Django +- Django Rest Framework (REST API) +- Django Channels (WebSocket interface) +- SQLite (Only because I am not deploying this to the Play Store) +- Redis (WebSocket cache) + +### Deployment +- Daphne (ASGI Application server) +- Nginx +- Ubuntu + +### Frontend +- Flutter + +## Pictures + +### Main Menu +![Login Screen](https://user-images.githubusercontent.com/44736322/204997033-fa10ceae-ae54-4816-b043-a1663532b5b3.png) + +### Profile Page +![Profile Page](https://user-images.githubusercontent.com/44736322/204997046-d3b09233-266f-4082-8f05-4b97d5369a18.png) + +### Search for Users +![Searching for users](https://user-images.githubusercontent.com/44736322/204997074-464c3b0c-96c2-4ac0-8e28-ebc1319c0065.png) + +### Create, Edit, and Delete Recipes +![Create Edit Delete Recipes](https://user-images.githubusercontent.com/44736322/204997088-cb4a34e4-9c09-408f-b15d-4b30a8409f5c.png) + +Recipes and individual ingredients can be deleted by swiping them off of the screen + +### Search for Recipes to add to Shopping List +![Search Recipes](https://user-images.githubusercontent.com/44736322/204997188-7e03d067-a26e-4629-be3f-ef9039eee54b.png) + +### Delete Items from List +![swipe](https://user-images.githubusercontent.com/44736322/205004229-c59ef486-edb6-4595-aa0c-846f008ab1a1.gif) + +### Shopping List Page +![Shopping List Page](https://user-images.githubusercontent.com/44736322/204997203-5341a35e-9269-43eb-a212-6404c8119482.png) + +### Backend Data Models +![backend-structure](https://user-images.githubusercontent.com/44736322/205004669-9f9387e0-1f76-42ac-8d49-d94cd17518aa.png) + + + + + +