Fix merge conflicts from main to shared_integration

LICENSE

@@ -1,41 +0,0 @@
-Copyright (c) 2025 Spencer Powell & Levi Lesches
-
-At time of writing this software is not licensed under a permissive license.
-If you are Professor Steven Moore of Binghamton University you may access the code as it exists on May 5th 2025 under an MIT license for the purposes of grading.
-A copy of the MIT license can be found at https://choosealicense.com/licenses/mit/ or at the bottom of this file.
-
-If you are anyone else you ARE NOT granted permission to read, use, modify, copy, merge, publich, distribute, sublicense or sell the software or any other rights to this software.
-
-Versions of this software written/published after May 5th 2025 may fall under a different license.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
------------------------------------------------------
-
-Example of MIT License THIS IS NOT THE LICENSE THIS SOFTWARE FALLS UNDER barring relicensing.
-
-Copyright (c) [year] [fullname]
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

README.md

@@ -1,60 +1,47 @@
 [![Review Assignment Due Date](https://classroom.github.com/assets/deadline-readme-button-22041afd0340ce965d47ae6ef1cefeee28c7c493a6346c4f15d667ab976d596c.svg)](https://classroom.github.com/a/vfKrPwQS)
-
-# Binghamton Better Bus (BBB) v2
+# << Project Title >>
 ## CS 445 Final Project
 ### Spring, 2025
 
-### Team: Team 4
+### Team: << team name >>
 
 - Spencer Powell
 - Levi Lesches
 
 ## Getting Started
-
-This project is a website which allows for picking a source and destination and getting the ideal bus route between the 2 given static information.
+<<One paragraph of project description goes here>>
 
 ### Roadmap
-
+  <<
 A list of features, function or non-functional, you would like to add in the future if you had time, i.e. Phase 2 stuff
-
-- [ ] Make use of time/direction information available in static scheduling information
-- [ ] Place our hardware on OCCT buses to remove ETA Spot dependence/legal question mark
-    - [ ] Design/build hardware
-            - Keyword reminder for mobile data: IoT data plan and/or M2M
-    - [ ] Negotiate placing hardware on OCCT buses
-- [ ] Chat with BCT about getting their live bus info
-- [ ] Use machine learning to predict bus locations based on current position, current time of day and current route,
+- [ ] Add Changelog
+- [ ] Add back to top links
+- [ ] Add Additional Templates w/ Examples
+- [ ] Add "components" document to easily copy & paste sections of the readme
+  >>
   
 ## SRS
-
 [doc](https://docs.google.com/document/d/1kSWMxsK0NakhvHRQnNx0wRlL6wDgYGO-tA7JB_4qldE/edit?usp=sharing)
   
 ### Prerequisites
-
 * [Docker](https://www.docker.com/)
-* Docker Compose
-* [Just](https://github.com/casey/just)
+* <<any additional software. Be specific about versions.>>
 
 ### Installing
-
-cd into the `src` directory and run `just setup` then run `docker-compose build`.
-
-To run just run `docker-compose up` in the `src` directory, the site will be up on `localhost:8080`
+<<
+ A step by step series of examples that tell you how to get a development env running
+Clearly outline each step and repeat until the environment is set up.
+End with an example of getting some output from the system, such as a menu or prompt
+>>
 
 ## Built With
-
-* [Deno](https://deno.com/)
-    - [Acorn](https://oakserver.org/acorn)
-* [Dart](https://dart.dev/)
-* [Flutter](https://flutter.dev/)
-    - Google maps
-* [Caddy](https://caddyserver.com/)
+ << list all frameworks and modules used here >>
+* [requests](https://docs.python-requests.org/en/latest/user/quickstart/#make-a-request) - request for humans
 
 ## License
-
-DIY license written out which grants MIT rights to professor moore for the version of this submitted for grading and no rights to anyone else.
+<< Add a [license](https://choosealicense.com/) >>
 
 ## Acknowledgments
-
-* Claude and chatGPT were used for the creation of scripts for certain rote data conversion tasks
-* This project would not exist with the data it has if not for prior instances of attempts to make this idea by US, of particular note is the usage of GTFS data which was only learned of in a prior attempt with Lucy Loerker
+* Hat tip to anyone whose code was used
+* Inspiration
+* etc

src/Justfile

@@ -1,13 +0,0 @@
-setup:
-    # this is a hack that is done due to a lack of communication
-    # towards the end of this project
-    # a slightly better hack could be done which avoids this but I
-    # don't wanna write things to work that way
-    cp -r client shared/client-dir
-    cp -r shared client/shared-dir
-    cp -r server/data shared/server-data
-    cp pubspec.yaml client/root-pubspec.yaml
-    cp pubspec.yaml shared/root-pubspec.yaml
-
-clean:
-    rm -rf client/root-pubspec.yaml shared/root-pubspec.yaml shared/client-dir client/shared-dir shared/server-data

src/client/.gitignore

@@ -47,4 +47,3 @@ app.*.map.json
 /android/app/release
 
 shared-dir
-root-pubspec.yaml

src/client/root-pubspec.yaml

@@ -0,0 +1,10 @@
+name: cs445
+
+environment:
+  sdk: ^3.7.0
+
+workspace:
+  - shared
+  - client
+dev_dependencies:
+  very_good_analysis: ^7.0.0

src/shared/.gitignore

@@ -4,6 +4,5 @@
 pubspec.lock
 client-dir
 server-data
-root-pubspec.yaml
 path.log
 notes.md

src/shared/root-pubspec.yaml

@@ -0,0 +1,10 @@
+name: cs445
+
+environment:
+  sdk: ^3.7.0
+
+workspace:
+  - shared
+  - client
+dev_dependencies:
+  very_good_analysis: ^7.0.0