diff --git a/.gitignore b/.gitignore index ae953e8..f6f20d5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,4 @@ -bird_cnn/data/ -bird_cnn/saved_models/ \ No newline at end of file +api/data/ +api/saved_models/ +api/testimages/ +api/__pycache__/ \ No newline at end of file diff --git a/bird_cnn/Dockerfile b/api/Dockerfile similarity index 100% rename from bird_cnn/Dockerfile rename to api/Dockerfile diff --git a/bird_cnn/bird_cnn.py b/api/bird_cnn.py similarity index 100% rename from bird_cnn/bird_cnn.py rename to api/bird_cnn.py diff --git a/bird_cnn/build_models/bird_cnn b/api/build_models/bird_cnn similarity index 100% rename from bird_cnn/build_models/bird_cnn rename to api/build_models/bird_cnn diff --git a/bird_cnn/r-cnn.py b/api/r-cnn.py similarity index 100% rename from bird_cnn/r-cnn.py rename to api/r-cnn.py diff --git a/bird_cnn/requirements.txt b/api/requirements.txt similarity index 100% rename from bird_cnn/requirements.txt rename to api/requirements.txt diff --git a/bird_cnn/selective_search.py b/api/selective_search.py similarity index 100% rename from bird_cnn/selective_search.py rename to api/selective_search.py diff --git a/bird_cnn/server.py b/api/server.py similarity index 100% rename from bird_cnn/server.py rename to api/server.py diff --git a/bird_cnn/start_server.bat b/api/start_server.bat similarity index 100% rename from bird_cnn/start_server.bat rename to api/start_server.bat diff --git a/bird_cnn/start_server.sh b/api/start_server.sh similarity index 100% rename from bird_cnn/start_server.sh rename to api/start_server.sh diff --git a/bird_cnn/train_bird.py b/api/train_bird.py similarity index 100% rename from bird_cnn/train_bird.py rename to api/train_bird.py diff --git a/bird_cnn/train_cifar.py b/api/train_cifar.py similarity index 100% rename from bird_cnn/train_cifar.py rename to api/train_cifar.py diff --git a/bird_cnn/train_mnist.py b/api/train_mnist.py similarity index 100% rename from bird_cnn/train_mnist.py rename to api/train_mnist.py diff --git a/bird_cnn/util.py b/api/util.py similarity index 100% rename from bird_cnn/util.py rename to api/util.py diff --git a/bird_cnn/__pycache__/bird_cnn.cpython-312.pyc b/bird_cnn/__pycache__/bird_cnn.cpython-312.pyc deleted file mode 100644 index 802ce04..0000000 Binary files a/bird_cnn/__pycache__/bird_cnn.cpython-312.pyc and /dev/null differ diff --git a/bird_cnn/__pycache__/bird_cnn.cpython-314.pyc b/bird_cnn/__pycache__/bird_cnn.cpython-314.pyc deleted file mode 100644 index 5fe7de8..0000000 Binary files a/bird_cnn/__pycache__/bird_cnn.cpython-314.pyc and /dev/null differ diff --git a/bird_cnn/__pycache__/main.cpython-314.pyc b/bird_cnn/__pycache__/main.cpython-314.pyc deleted file mode 100644 index f953b57..0000000 Binary files a/bird_cnn/__pycache__/main.cpython-314.pyc and /dev/null differ diff --git a/bird_cnn/__pycache__/server.cpython-314.pyc b/bird_cnn/__pycache__/server.cpython-314.pyc deleted file mode 100644 index 25b1bfe..0000000 Binary files a/bird_cnn/__pycache__/server.cpython-314.pyc and /dev/null differ diff --git a/bird_cnn/testimages/House_Crow1.jpg b/bird_cnn/testimages/House_Crow1.jpg deleted file mode 100644 index 7eec745..0000000 Binary files a/bird_cnn/testimages/House_Crow1.jpg and /dev/null differ diff --git a/bird_cnn/testimages/House_Crow1_resized.jpg b/bird_cnn/testimages/House_Crow1_resized.jpg deleted file mode 100644 index 6de406e..0000000 Binary files a/bird_cnn/testimages/House_Crow1_resized.jpg and /dev/null differ diff --git a/bird_cnn/testimages/House_Crow2.jpg b/bird_cnn/testimages/House_Crow2.jpg deleted file mode 100644 index 8ed27bc..0000000 Binary files a/bird_cnn/testimages/House_Crow2.jpg and /dev/null differ diff --git a/bird_cnn/testimages/test.jpg b/bird_cnn/testimages/test.jpg deleted file mode 100644 index 2df10da..0000000 Binary files a/bird_cnn/testimages/test.jpg and /dev/null differ diff --git a/bird_cnn/testimages/test1.jpg b/bird_cnn/testimages/test1.jpg deleted file mode 100644 index 512da5a..0000000 Binary files a/bird_cnn/testimages/test1.jpg and /dev/null differ diff --git a/bird_cnn/testimages/two_crows.jpg b/bird_cnn/testimages/two_crows.jpg deleted file mode 100644 index b734da0..0000000 Binary files a/bird_cnn/testimages/two_crows.jpg and /dev/null differ diff --git a/bird_cnn/testimages/wide_image.jpg b/bird_cnn/testimages/wide_image.jpg deleted file mode 100644 index 95d24c1..0000000 Binary files a/bird_cnn/testimages/wide_image.jpg and /dev/null differ diff --git a/compose.yaml b/compose.yaml new file mode 100644 index 0000000..349bbbb --- /dev/null +++ b/compose.yaml @@ -0,0 +1,16 @@ +services: + cnn_website: + build: + context: api/. + image: cnn_api + ports: + - "8000:8000" + restart: unless-stopped + + cnn_website: + build: + context: website/. + image: cnn_website + ports: + - "8080:80" + restart: unless-stopped \ No newline at end of file diff --git a/compose_api.yaml b/compose_api.yaml deleted file mode 100644 index eced4e6..0000000 --- a/compose_api.yaml +++ /dev/null @@ -1,9 +0,0 @@ -services: - cnn_website: - build: - context: bird_cnn/. - image: cnn_api - container_name: cnn_api_1 - ports: - - "8000:8000" - restart: unless-stopped \ No newline at end of file diff --git a/compose_website.yaml b/compose_website.yaml deleted file mode 100644 index 424af70..0000000 --- a/compose_website.yaml +++ /dev/null @@ -1,9 +0,0 @@ -services: - cnn_website: - build: - context: cnn_website/. - image: cnn_website - container_name: cnn_website_1 - ports: - - "8080:80" - restart: unless-stopped \ No newline at end of file diff --git a/cnn_website/.gitignore b/website/.gitignore similarity index 100% rename from cnn_website/.gitignore rename to website/.gitignore diff --git a/cnn_website/Dockerfile b/website/Dockerfile similarity index 100% rename from cnn_website/Dockerfile rename to website/Dockerfile diff --git a/cnn_website/README.md b/website/README.md similarity index 100% rename from cnn_website/README.md rename to website/README.md diff --git a/cnn_website/eslint.config.js b/website/eslint.config.js similarity index 100% rename from cnn_website/eslint.config.js rename to website/eslint.config.js diff --git a/cnn_website/index.html b/website/index.html similarity index 100% rename from cnn_website/index.html rename to website/index.html diff --git a/cnn_website/package-lock.json b/website/package-lock.json similarity index 100% rename from cnn_website/package-lock.json rename to website/package-lock.json diff --git a/cnn_website/package.json b/website/package.json similarity index 100% rename from cnn_website/package.json rename to website/package.json diff --git a/cnn_website/public/cherry_bird.jpeg b/website/public/cherry_bird.jpeg similarity index 100% rename from cnn_website/public/cherry_bird.jpeg rename to website/public/cherry_bird.jpeg diff --git a/cnn_website/public/favicon.svg b/website/public/favicon.svg similarity index 100% rename from cnn_website/public/favicon.svg rename to website/public/favicon.svg diff --git a/cnn_website/public/generated_two_no_background.png b/website/public/generated_two_no_background.png similarity index 100% rename from cnn_website/public/generated_two_no_background.png rename to website/public/generated_two_no_background.png diff --git a/cnn_website/public/icons.svg b/website/public/icons.svg similarity index 100% rename from cnn_website/public/icons.svg rename to website/public/icons.svg diff --git a/cnn_website/src/App.css b/website/src/App.css similarity index 100% rename from cnn_website/src/App.css rename to website/src/App.css diff --git a/cnn_website/src/App.jsx b/website/src/App.jsx similarity index 100% rename from cnn_website/src/App.jsx rename to website/src/App.jsx diff --git a/cnn_website/src/Bird_CNN.css b/website/src/Bird_CNN.css similarity index 100% rename from cnn_website/src/Bird_CNN.css rename to website/src/Bird_CNN.css diff --git a/cnn_website/src/Bird_CNN.jsx b/website/src/Bird_CNN.jsx similarity index 100% rename from cnn_website/src/Bird_CNN.jsx rename to website/src/Bird_CNN.jsx diff --git a/cnn_website/src/Homepage.jsx b/website/src/Homepage.jsx similarity index 100% rename from cnn_website/src/Homepage.jsx rename to website/src/Homepage.jsx diff --git a/cnn_website/src/Menu.css b/website/src/Menu.css similarity index 100% rename from cnn_website/src/Menu.css rename to website/src/Menu.css diff --git a/cnn_website/src/Menu.jsx b/website/src/Menu.jsx similarity index 100% rename from cnn_website/src/Menu.jsx rename to website/src/Menu.jsx diff --git a/cnn_website/src/assets/hero.png b/website/src/assets/hero.png similarity index 100% rename from cnn_website/src/assets/hero.png rename to website/src/assets/hero.png diff --git a/cnn_website/src/assets/react.svg b/website/src/assets/react.svg similarity index 100% rename from cnn_website/src/assets/react.svg rename to website/src/assets/react.svg diff --git a/cnn_website/src/assets/vite.svg b/website/src/assets/vite.svg similarity index 100% rename from cnn_website/src/assets/vite.svg rename to website/src/assets/vite.svg diff --git a/cnn_website/src/index.css b/website/src/index.css similarity index 100% rename from cnn_website/src/index.css rename to website/src/index.css diff --git a/cnn_website/src/main.jsx b/website/src/main.jsx similarity index 100% rename from cnn_website/src/main.jsx rename to website/src/main.jsx diff --git a/cnn_website/vite.config.js b/website/vite.config.js similarity index 100% rename from cnn_website/vite.config.js rename to website/vite.config.js