Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,6 @@ angular/test/build/
packages/vue/test/build/

.npmrc
TableBookingAPI/TableBooking/obj
TableBookingAPI/TableBooking/appsettings.json
TableBookingAPI/TableBooking.Api/obj
TableBookingAPI/TableBooking.Api/appsettings.json
TableBookingAPI/.vs
33 changes: 19 additions & 14 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,17 +1,22 @@
# TableBooking app
# Table Booking API
Client for this api can be found at different repository at this URL: https://github.com/TeriyakiGod/tablebooking_flutter
## Prerequisites

Web applications that allows you to book a table at your favourite restaurant.
* Install Docker
* Install.NET 8.0

# Features
- Working on it...
# How to Use
- Working on it...
# Technologies Used
- Ionic
- Vue
- Entity Framework Core
- ASP.NET
- PostgreSQL
# Future Improvements
- Book a table
## Application setup

In order to get the application running locally along with seeded database perform these steps:

1. Make sure container named 'tablebooking_api_db' doesn't exist in your docker environment
2. Write those secret values received from Pawel Frankowski to 'Solution Items/.env' file:
POSTGRES_USER=...
POSTGRES_PASSWORD=...
POSTGRES_DB=...
POSTGRES_VERSION=16.0
3. Execute command on solution folder:
```bash
docker compose up db
```
4. Run the api locally (button)
Original file line number Diff line number Diff line change
@@ -1,16 +1,14 @@
#See https://aka.ms/customizecontainer to learn how to customize your debug container and how Visual Studio uses this Dockerfile to build your images for faster debugging.

FROM mcr.microsoft.com/dotnet/aspnet:6.0 AS base
WORKDIR /app
EXPOSE 80
EXPOSE 443

FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build
WORKDIR /src
COPY ["TableBooking/TableBooking.Api.csproj", "TableBooking/"]
RUN dotnet restore "TableBooking/TableBooking.Api.csproj"
COPY ["TableBooking.Api/TableBooking.Api.csproj", "TableBooking.Api/"]
RUN dotnet restore "TableBooking.Api/TableBooking.Api.csproj"
COPY . .
WORKDIR "/src/TableBooking"
WORKDIR "/src/TableBooking.Api"
RUN dotnet build "TableBooking.Api.csproj" -c Release -o /app/build

FROM build AS publish
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\TableBooking.Api\TableBooking.Api.csproj" />
<ProjectReference Include="..\TableBooking\TableBooking.Api.csproj" />
</ItemGroup>

Expand Down
12 changes: 6 additions & 6 deletions TableBookingAPI/TableBooking.sln → TableBooking.sln
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.7.34009.444
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TableBooking.Api", "TableBooking\TableBooking.Api.csproj", "{4B7B965D-99E8-4CC4-AC67-57F4055E962C}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{415AFF54-C855-4B6A-A3D1-05B32100C08F}"
ProjectSection(SolutionItems) = preProject
.env = .env
Expand All @@ -19,16 +17,14 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TableBooking.IntegrationTes
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TableBooking.Logic", "TableBooking.Logic\TableBooking.Logic.csproj", "{11C2A605-A9FE-4C1F-AEA6-42598F8A396A}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TableBooking.Api", "TableBooking.Api\TableBooking.Api.csproj", "{8D1F5E3B-B4D4-4222-8BB2-DAAD8180425C}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{4B7B965D-99E8-4CC4-AC67-57F4055E962C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4B7B965D-99E8-4CC4-AC67-57F4055E962C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4B7B965D-99E8-4CC4-AC67-57F4055E962C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4B7B965D-99E8-4CC4-AC67-57F4055E962C}.Release|Any CPU.Build.0 = Release|Any CPU
{D78B787F-4760-4AB1-B369-DBEBEFD632DF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D78B787F-4760-4AB1-B369-DBEBEFD632DF}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D78B787F-4760-4AB1-B369-DBEBEFD632DF}.Release|Any CPU.ActiveCfg = Release|Any CPU
Expand All @@ -41,6 +37,10 @@ Global
{11C2A605-A9FE-4C1F-AEA6-42598F8A396A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{11C2A605-A9FE-4C1F-AEA6-42598F8A396A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{11C2A605-A9FE-4C1F-AEA6-42598F8A396A}.Release|Any CPU.Build.0 = Release|Any CPU
{8D1F5E3B-B4D4-4222-8BB2-DAAD8180425C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{8D1F5E3B-B4D4-4222-8BB2-DAAD8180425C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8D1F5E3B-B4D4-4222-8BB2-DAAD8180425C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{8D1F5E3B-B4D4-4222-8BB2-DAAD8180425C}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
2 changes: 0 additions & 2 deletions TableBookingAPI/.gitignore

This file was deleted.

19 changes: 0 additions & 19 deletions TableBookingAPI/README.md

This file was deleted.

4 changes: 0 additions & 4 deletions TableBookingClient/.browserslistrc

This file was deleted.

32 changes: 0 additions & 32 deletions TableBookingClient/.eslintrc.js

This file was deleted.

5 changes: 0 additions & 5 deletions TableBookingClient/babel.config.js

This file was deleted.

10 changes: 0 additions & 10 deletions TableBookingClient/capacitor.config.ts

This file was deleted.

3 changes: 0 additions & 3 deletions TableBookingClient/cypress.json

This file was deleted.

7 changes: 0 additions & 7 deletions TableBookingClient/ionic.config.json

This file was deleted.

4 changes: 0 additions & 4 deletions TableBookingClient/jest.config.js

This file was deleted.

Loading