diff --git a/.gitignore b/.gitignore index a08c3b2..892656a 100644 --- a/.gitignore +++ b/.gitignore @@ -91,10 +91,10 @@ out .gradle !gradle/wrapper/gradle-wrapper.jar -frontend/src/index.js +client/src/index.js .env .DS_Store -backend/src/resources/application.yml +server/src/resources/application.yml diff --git a/build.gradle b/build.gradle index 7409ee6..9ac3d30 100644 --- a/build.gradle +++ b/build.gradle @@ -50,18 +50,18 @@ dependencies { sourceSets { main { java { - srcDir 'backend/src/main/' + srcDir 'server/src/main/' } resources { - srcDir 'backend/src/resources' + srcDir 'server/src/resources' } } test { java { - srcDir 'backend/src/test/java' + srcDir 'server/src/test/java' } resources { - srcDir 'backend/src/test/resources' + srcDir 'server/src/test/resources' } } } diff --git a/frontend/.gitignore b/client/.gitignore similarity index 100% rename from frontend/.gitignore rename to client/.gitignore diff --git a/frontend/README.md b/client/README.md similarity index 100% rename from frontend/README.md rename to client/README.md diff --git a/frontend/babel.config.js b/client/babel.config.js similarity index 100% rename from frontend/babel.config.js rename to client/babel.config.js diff --git a/frontend/jsconfig.json b/client/jsconfig.json similarity index 100% rename from frontend/jsconfig.json rename to client/jsconfig.json diff --git a/frontend/package-lock.json b/client/package-lock.json similarity index 100% rename from frontend/package-lock.json rename to client/package-lock.json diff --git a/frontend/package.json b/client/package.json similarity index 100% rename from frontend/package.json rename to client/package.json diff --git a/frontend/public/favicon.ico b/client/public/favicon.ico similarity index 100% rename from frontend/public/favicon.ico rename to client/public/favicon.ico diff --git a/frontend/public/index.html b/client/public/index.html similarity index 100% rename from frontend/public/index.html rename to client/public/index.html diff --git a/frontend/public/style.css b/client/public/style.css similarity index 100% rename from frontend/public/style.css rename to client/public/style.css diff --git a/frontend/src/Api.js b/client/src/Api.js similarity index 100% rename from frontend/src/Api.js rename to client/src/Api.js diff --git a/frontend/src/App.vue b/client/src/App.vue similarity index 100% rename from frontend/src/App.vue rename to client/src/App.vue diff --git a/frontend/src/components/Custom404Page.vue b/client/src/components/Custom404Page.vue similarity index 100% rename from frontend/src/components/Custom404Page.vue rename to client/src/components/Custom404Page.vue diff --git a/frontend/src/components/HomePage.vue b/client/src/components/HomePage.vue similarity index 100% rename from frontend/src/components/HomePage.vue rename to client/src/components/HomePage.vue diff --git a/frontend/src/components/ItemModel.vue b/client/src/components/ItemModel.vue similarity index 100% rename from frontend/src/components/ItemModel.vue rename to client/src/components/ItemModel.vue diff --git a/frontend/src/components/LoginPage.vue b/client/src/components/LoginPage.vue similarity index 100% rename from frontend/src/components/LoginPage.vue rename to client/src/components/LoginPage.vue diff --git a/frontend/src/main.js b/client/src/main.js similarity index 100% rename from frontend/src/main.js rename to client/src/main.js diff --git a/frontend/src/styling/navbar.scss b/client/src/styling/navbar.scss similarity index 100% rename from frontend/src/styling/navbar.scss rename to client/src/styling/navbar.scss diff --git a/frontend/vue.config.js b/client/vue.config.js similarity index 100% rename from frontend/vue.config.js rename to client/vue.config.js diff --git a/frontend/yarn.lock b/client/yarn.lock similarity index 100% rename from frontend/yarn.lock rename to client/yarn.lock diff --git a/backend/src/main/spoonaccular/APIAuthentication.java b/server/src/main/spoonaccular/APIAuthentication.java similarity index 100% rename from backend/src/main/spoonaccular/APIAuthentication.java rename to server/src/main/spoonaccular/APIAuthentication.java diff --git a/backend/src/main/spoonaccular/AmountConversion.java b/server/src/main/spoonaccular/AmountConversion.java similarity index 100% rename from backend/src/main/spoonaccular/AmountConversion.java rename to server/src/main/spoonaccular/AmountConversion.java diff --git a/backend/src/main/spoonaccular/RecipeInformation.java b/server/src/main/spoonaccular/RecipeInformation.java similarity index 100% rename from backend/src/main/spoonaccular/RecipeInformation.java rename to server/src/main/spoonaccular/RecipeInformation.java diff --git a/backend/src/main/spoonaccular/RecipeSearch.java b/server/src/main/spoonaccular/RecipeSearch.java similarity index 100% rename from backend/src/main/spoonaccular/RecipeSearch.java rename to server/src/main/spoonaccular/RecipeSearch.java diff --git a/backend/src/main/spoonaccular/models/amount_conversion/ConvertedAmount.java b/server/src/main/spoonaccular/models/amount_conversion/ConvertedAmount.java similarity index 100% rename from backend/src/main/spoonaccular/models/amount_conversion/ConvertedAmount.java rename to server/src/main/spoonaccular/models/amount_conversion/ConvertedAmount.java diff --git a/backend/src/main/spoonaccular/models/ingredients_by_id/Amount.java b/server/src/main/spoonaccular/models/ingredients_by_id/Amount.java similarity index 100% rename from backend/src/main/spoonaccular/models/ingredients_by_id/Amount.java rename to server/src/main/spoonaccular/models/ingredients_by_id/Amount.java diff --git a/backend/src/main/spoonaccular/models/ingredients_by_id/Ingredient.java b/server/src/main/spoonaccular/models/ingredients_by_id/Ingredient.java similarity index 100% rename from backend/src/main/spoonaccular/models/ingredients_by_id/Ingredient.java rename to server/src/main/spoonaccular/models/ingredients_by_id/Ingredient.java diff --git a/backend/src/main/spoonaccular/models/ingredients_by_id/Metric.java b/server/src/main/spoonaccular/models/ingredients_by_id/Metric.java similarity index 100% rename from backend/src/main/spoonaccular/models/ingredients_by_id/Metric.java rename to server/src/main/spoonaccular/models/ingredients_by_id/Metric.java diff --git a/backend/src/main/spoonaccular/models/ingredients_by_id/Us.java b/server/src/main/spoonaccular/models/ingredients_by_id/Us.java similarity index 100% rename from backend/src/main/spoonaccular/models/ingredients_by_id/Us.java rename to server/src/main/spoonaccular/models/ingredients_by_id/Us.java diff --git a/backend/src/main/spoonaccular/models/recipe_by_ingredient/ExtendedRecipeByIngredient.java b/server/src/main/spoonaccular/models/recipe_by_ingredient/ExtendedRecipeByIngredient.java similarity index 100% rename from backend/src/main/spoonaccular/models/recipe_by_ingredient/ExtendedRecipeByIngredient.java rename to server/src/main/spoonaccular/models/recipe_by_ingredient/ExtendedRecipeByIngredient.java diff --git a/backend/src/main/spoonaccular/models/recipe_by_ingredient/MissedIngredient.java b/server/src/main/spoonaccular/models/recipe_by_ingredient/MissedIngredient.java similarity index 100% rename from backend/src/main/spoonaccular/models/recipe_by_ingredient/MissedIngredient.java rename to server/src/main/spoonaccular/models/recipe_by_ingredient/MissedIngredient.java diff --git a/backend/src/main/spoonaccular/models/recipe_by_ingredient/RecipeByIngredient.java b/server/src/main/spoonaccular/models/recipe_by_ingredient/RecipeByIngredient.java similarity index 100% rename from backend/src/main/spoonaccular/models/recipe_by_ingredient/RecipeByIngredient.java rename to server/src/main/spoonaccular/models/recipe_by_ingredient/RecipeByIngredient.java diff --git a/backend/src/main/spoonaccular/models/recipe_by_ingredient/UsedIngredient.java b/server/src/main/spoonaccular/models/recipe_by_ingredient/UsedIngredient.java similarity index 100% rename from backend/src/main/spoonaccular/models/recipe_by_ingredient/UsedIngredient.java rename to server/src/main/spoonaccular/models/recipe_by_ingredient/UsedIngredient.java diff --git a/backend/src/main/spoonaccular/models/recipe_information/ExtendedIngredient.java b/server/src/main/spoonaccular/models/recipe_information/ExtendedIngredient.java similarity index 100% rename from backend/src/main/spoonaccular/models/recipe_information/ExtendedIngredient.java rename to server/src/main/spoonaccular/models/recipe_information/ExtendedIngredient.java diff --git a/backend/src/main/spoonaccular/models/recipe_information/Measures.java b/server/src/main/spoonaccular/models/recipe_information/Measures.java similarity index 100% rename from backend/src/main/spoonaccular/models/recipe_information/Measures.java rename to server/src/main/spoonaccular/models/recipe_information/Measures.java diff --git a/backend/src/main/spoonaccular/models/recipe_information/Metric.java b/server/src/main/spoonaccular/models/recipe_information/Metric.java similarity index 100% rename from backend/src/main/spoonaccular/models/recipe_information/Metric.java rename to server/src/main/spoonaccular/models/recipe_information/Metric.java diff --git a/backend/src/main/spoonaccular/models/recipe_information/Recipe.java b/server/src/main/spoonaccular/models/recipe_information/Recipe.java similarity index 100% rename from backend/src/main/spoonaccular/models/recipe_information/Recipe.java rename to server/src/main/spoonaccular/models/recipe_information/Recipe.java diff --git a/backend/src/main/whattocook/Application.java b/server/src/main/whattocook/Application.java similarity index 100% rename from backend/src/main/whattocook/Application.java rename to server/src/main/whattocook/Application.java diff --git a/backend/src/main/whattocook/configs/RepositoryConfig.java b/server/src/main/whattocook/configs/RepositoryConfig.java similarity index 100% rename from backend/src/main/whattocook/configs/RepositoryConfig.java rename to server/src/main/whattocook/configs/RepositoryConfig.java diff --git a/backend/src/main/whattocook/controller/IngredientController.java b/server/src/main/whattocook/controller/IngredientController.java similarity index 100% rename from backend/src/main/whattocook/controller/IngredientController.java rename to server/src/main/whattocook/controller/IngredientController.java diff --git a/backend/src/main/whattocook/controller/RecipeSearchController.java b/server/src/main/whattocook/controller/RecipeSearchController.java similarity index 100% rename from backend/src/main/whattocook/controller/RecipeSearchController.java rename to server/src/main/whattocook/controller/RecipeSearchController.java diff --git a/backend/src/main/whattocook/exception/ItemNotFoundException.java b/server/src/main/whattocook/exception/ItemNotFoundException.java similarity index 100% rename from backend/src/main/whattocook/exception/ItemNotFoundException.java rename to server/src/main/whattocook/exception/ItemNotFoundException.java diff --git a/backend/src/main/whattocook/implementation/ItemServiceImpl.java b/server/src/main/whattocook/implementation/ItemServiceImpl.java similarity index 100% rename from backend/src/main/whattocook/implementation/ItemServiceImpl.java rename to server/src/main/whattocook/implementation/ItemServiceImpl.java diff --git a/backend/src/main/whattocook/models/Item.java b/server/src/main/whattocook/models/Item.java similarity index 100% rename from backend/src/main/whattocook/models/Item.java rename to server/src/main/whattocook/models/Item.java diff --git a/backend/src/main/whattocook/models/Unit.java b/server/src/main/whattocook/models/Unit.java similarity index 100% rename from backend/src/main/whattocook/models/Unit.java rename to server/src/main/whattocook/models/Unit.java diff --git a/backend/src/main/whattocook/repositories/ItemRepository.java b/server/src/main/whattocook/repositories/ItemRepository.java similarity index 100% rename from backend/src/main/whattocook/repositories/ItemRepository.java rename to server/src/main/whattocook/repositories/ItemRepository.java diff --git a/backend/src/main/whattocook/services/ItemService.java b/server/src/main/whattocook/services/ItemService.java similarity index 100% rename from backend/src/main/whattocook/services/ItemService.java rename to server/src/main/whattocook/services/ItemService.java diff --git a/backend/src/resources/application.yml.example b/server/src/resources/application.yml.example similarity index 100% rename from backend/src/resources/application.yml.example rename to server/src/resources/application.yml.example diff --git a/backend/src/test/java/items/ItemTests.java b/server/src/test/java/items/ItemTests.java similarity index 100% rename from backend/src/test/java/items/ItemTests.java rename to server/src/test/java/items/ItemTests.java diff --git a/backend/src/test/resources/application.yml b/server/src/test/resources/application.yml similarity index 100% rename from backend/src/test/resources/application.yml rename to server/src/test/resources/application.yml