Skip to content

Commit

Permalink
Added Delivery options
Browse files Browse the repository at this point in the history
  • Loading branch information
acmoune committed May 23, 2024
1 parent 4134a38 commit 578c252
Show file tree
Hide file tree
Showing 128 changed files with 34,198 additions and 78 deletions.
13 changes: 8 additions & 5 deletions osan-web.sln
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,15 @@ VisualStudioVersion = 17.0.31903.59
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{4CCAC5A8-BB6C-4983-BAAC-6676FD681441}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OsanWebsite.Core", "src\OsanWebsite.Core\OsanWebsite.Core.csproj", "{C9B39243-3C06-493F-957B-3156E03979A2}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OsanWebsite.Core", "src\OsanWebsite.Core\OsanWebsite.Core.csproj", "{C9B39243-3C06-493F-957B-3156E03979A2}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OsanWebsite.Web", "src\OsanWebsite.Web\OsanWebsite.Web.csproj", "{6CF6E323-D87D-4CAD-BB9D-D9E6A4AB2972}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OsanWebsite.Web", "src\OsanWebsite.Web\OsanWebsite.Web.csproj", "{6CF6E323-D87D-4CAD-BB9D-D9E6A4AB2972}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{C9B39243-3C06-493F-957B-3156E03979A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C9B39243-3C06-493F-957B-3156E03979A2}.Debug|Any CPU.Build.0 = Debug|Any CPU
Expand All @@ -27,8 +24,14 @@ Global
{6CF6E323-D87D-4CAD-BB9D-D9E6A4AB2972}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6CF6E323-D87D-4CAD-BB9D-D9E6A4AB2972}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{C9B39243-3C06-493F-957B-3156E03979A2} = {4CCAC5A8-BB6C-4983-BAAC-6676FD681441}
{6CF6E323-D87D-4CAD-BB9D-D9E6A4AB2972} = {4CCAC5A8-BB6C-4983-BAAC-6676FD681441}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {5F6A3964-5C3A-4397-AEA8-0C6325741160}
EndGlobalSection
EndGlobal
36 changes: 1 addition & 35 deletions src/OsanWebsite.Web/Pages/AboutPage.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -30,41 +30,7 @@
prend tout son sens.
</div>

<div class="mob-only">
<div style="text-align:center; font-size: 9pt; border: 1px solid #e1bbc5;border-radius:10px;padding: 15px;padding-bottom:0px;margin-bottom: 25px;">
<div style="text-align:center;padding-top: 0px; color: #db0842;margin-bottom: 10px;">
HEURES ET SERVICES
</div>

@foreach (var service in Model.Services)
{
<div>
<div style="color: #db0842;">
@Html.Raw(service.ToHtmlString())
</div>

@if (!String.IsNullOrEmpty(service.Description))
{
<div class="ho-service-description">@service.Description</div>
}
<br />
</div>
}
</div>

<div style="border: 1px solid #e1bbc5;border-radius:10px; margin-top: 25px;font-size: 9pt;padding: 10px;">
<div style="color: #db0842;margin-bottom: 10px;text-align:center;">LIVRAISON À DOMICILE</div>
<div>
Savourez le raffinement d'<strong>O'SAN</strong> chez vous ou au bureau. Notre service de livraison à domicile vous propose nos délices culinaires et vins
d'exception, de midi à 23h à Douala 5e, avec des frais de livraison de seulement 1000 F. Commandez dès maintenant pour une expérience
gastronomique unique, où le luxe s'invite chez vous.
</div>

<div style="color: #db0842;font-weight:bold;font-size: 10pt;margin-top: 10px;text-align:center;"><span class="fa fa-phone"></span> &nbsp; (+237) 692 62 38 85</div>
</div>

<br />

<div class="mob-only" style="border-top: 1px solid #e1bbc5">
<div style="display:flex;align-items:center;padding: 10px 0px;font-size: 10pt;">
<span class="fa fa-map-marker" style="font-size: 13pt;color: #db0842;"></span>
<div style="display:flex; flex-direction:column;flex-grow:1;text-align:center;">
Expand Down
23 changes: 23 additions & 0 deletions src/OsanWebsite.Web/Pages/CardsPage.cshtml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
@page "/nos-cartes"
@model OsanWebsite.Web.Pages.CardsPageModel
@{
ViewData["Title"] = "Nos Cartes";
}

<h4>Nos Cartes</h4>

<div style="display:flex;align-items:center; background-color: #ffeccc; border-radius: 10px; padding: 15px; font-size: 9pt; color:#540b1c; margin-bottom: 15px;">
<span class="fa fa-file-pdf" style="font-size: 24pt;"></span>
<div style="flex-grow: 1; margin-left: 10px;">
<div style="font-weight: bold;">Cartes des Repas</div>
<a href="~/docs/carte-repas-OSAN-v2.pdf" target="_blank" class="osan-link">Télécharger</a>
</div>
</div>

<div style="display:flex;align-items:center; background-color: #ffeccc; border-radius: 10px; padding: 15px; font-size: 9pt; color:#540b1c; margin-bottom: 15px;">
<span class="fa fa-file-pdf" style="font-size: 24pt;"></span>
<div style="flex-grow: 1; margin-left: 10px;">
<div style="font-weight: bold;">Cartes des Boissons</div>
<a href="~/docs/carte-boissons-OSAN-v2.pdf" target="_blank" class="osan-link">Télécharger</a>
</div>
</div>
12 changes: 12 additions & 0 deletions src/OsanWebsite.Web/Pages/CardsPage.cshtml.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.RazorPages;

namespace OsanWebsite.Web.Pages
{
public class CardsPageModel : PageModel
{
public void OnGet()
{
}
}
}
21 changes: 21 additions & 0 deletions src/OsanWebsite.Web/Pages/DeliveryPage.cshtml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
@page "/livraison"
@model OsanWebsite.Web.Pages.DeliveryPageModel
@{
ViewData["Title"] = "Livraison";
}

<h4>Se faire livrer</h4>

<img src="~/images/livraison1.jpg" style="width: 100%; border-top-left-radius: 10px;border-top-right-radius: 10px; border: 1px solid #e1bbc5;border-bottom-width: 0px;" />
<div style="border: 1px solid #e1bbc5;border-bottom-left-radius: 10px;border-bottom-right-radius: 10px; padding: 10px; background-color: #ffeccc;border-top-width: 0px;padding-top: 10px; font-size: 10pt;color:#540b1c">
Savourez le raffinement d'<strong>O'SAN</strong> chez vous ou au bureau. Notre service de livraison à domicile vous propose nos délices culinaires et vins
d'exception, de midi à 23h à Douala 5e, avec des frais de livraison de seulement 1000FCFA. Commandez dès maintenant pour une expérience
gastronomique unique, où le luxe s'invite chez vous.

<br />
<br />
<div style="text-align:center;margin-top: 5px;">
<div style="font-weight: bold;">Consultez <a href="/nos-cartes" class="osan-link" style="display:inline-block">Nos cartes</a> puis contactez nous.</div>
<div style="font-size: 14pt;"><span class="fa fa-phone"></span> <span class="fa-brands fa-whatsapp"></span> &nbsp; (+237) 692 62 38 85</div>
</div>
</div>
12 changes: 12 additions & 0 deletions src/OsanWebsite.Web/Pages/DeliveryPage.cshtml.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.RazorPages;

namespace OsanWebsite.Web.Pages
{
public class DeliveryPageModel : PageModel
{
public void OnGet()
{
}
}
}
4 changes: 2 additions & 2 deletions src/OsanWebsite.Web/Pages/Index.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@
</div>

<div style="text-align:center;">
Vous pouvez <a href="/reservation" class="osan-link" style="display:inline">réserver une table</a> ou vous faire livrer à domicile.
Vous pouvez <a href="/reservation" class="osan-link" style="display:inline">réserver une table</a> ou <a href="/livraison" class="osan-link" style="display:inline">vous faire livrer</a>.
</div>

<br />

<p>
Ne manquez pas nos soirées <strong>Piano Bar</strong>, il y en a déjà eu pas mal (<a href="/?feed=archived" class="osan-link" style="display:inline">archives</a>). Abonnez-vous sur nos pages <strong>Facebook/Insta/Twitter</strong> et restez connectés à notre
Ne manquez pas nos soirées <strong>Piano Bar</strong>, il y en a déjà eu pas mal (<a href="/?feed=archived" class="osan-link" style="display:inline">archives</a>). Abonnez-vous sur nos pages <strong>Facebook</strong>, <strong>Instagram</strong>, et <strong>Twitter</strong> et restez connectés à notre
<a href="/?feed=calendar" class="osan-link" style="display:inline">calendrier</a>. N'hésitez pas à nous contacter pour vos évènements privés.
</p>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,37 +1,31 @@
@model SideContentModel

<div style="padding-top:10px;">
<div style="border: 1px solid #e1bbc5;border-radius:10px;padding: 15px;padding-bottom:0px;margin-bottom: 15px;">
<div class="ho-sidebar-header" style="text-align: left;padding-top: 0px; color: #db0842;">
HEURES ET SERVICES
</div>
<div style="position: relative">
<div style="position: absolute;width: 100%; text-align: center; left: 0px; bottom: 50px; font-size: 8pt; color: #540b1c;">
<div style="">
HEURES ET SERVICES
</div>

@foreach (var service in Model.Services)
{
<div class="ho-service">
<div class="ho-service-name" style="color: #db0842;">
@foreach (var service in Model.Services)
{
<div style="">
@Html.Raw(service.ToHtmlString())
</div>

@if (!String.IsNullOrEmpty(service.Description))
{
<div class="ho-service-description">@service.Description</div>
}
</div>
}
</div>
}
</div>

<a href="/a-propos" class="osan-btn" style="margin-bottom:5px;">À propos</a>
<a href="/reservation" class="osan-btn">Réserver une table</a>
<img src="~/images/osan2.jpg" style="width: 100%; border-top-left-radius: 10px;border-top-right-radius: 10px; border: 1px solid #e1bbc5;" />
<div style="border: 1px solid #e1bbc5;border-bottom-left-radius: 10px;border-bottom-right-radius: 10px; padding: 10px; background-color: #ffeccc;border-top-width: 0px;">
<a href="/reservation" class="osan-btn">Réserver une table</a>
</div>
</div>

<div style="border: 1px solid #e1bbc5;border-radius:10px; margin-top: 15px;font-size: 9pt;padding: 10px;">
<div style="color: #db0842;margin-bottom: 10px;">LIVRAISON À DOMICILE</div>
<div>
Savourez le raffinement d'<strong>O'SAN</strong> chez vous ou au bureau. Notre service de livraison à domicile vous propose nos délices culinaires et vins d'exception,
de midi à 23h à Douala 5e, avec des frais de livraison de seulement 1000 F. Commandez dès maintenant pour une expérience gastronomique unique,
où le luxe s'invite chez vous.
<div>
<img src="~/images/livraison2.jpg" style="width: 100%; border-top-left-radius: 10px;border-top-right-radius: 10px; border: 1px solid #e1bbc5; margin-top: 15px;" />
<div style="border: 1px solid #e1bbc5;border-bottom-left-radius: 10px;border-bottom-right-radius: 10px; padding: 10px; background-color: #ffeccc;border-top-width: 0px;">
<a href="/livraison" class="osan-btn">Se faire livrer</a>
</div>
<div style="color: #db0842;font-weight:bold;font-size: 10pt;margin-top: 10px;"><span class="fa fa-phone"></span> &nbsp; (+237) 692 62 38 85</div>
</div>

@if (Model.NextEvent != null)
Expand Down
20 changes: 17 additions & 3 deletions src/OsanWebsite.Web/Pages/Shared/_Layout.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

@RenderSection("metatags", required: false)

<link rel="stylesheet" href="~/css/bootstrap4/bootstrap.min.css" integrity="sha384-zCbKRCUGaJDkqS1kPbPd7TveP5iyJE0EjAuZQTgFLD2ylzuqKfdKlfG/eSrtxUkn" crossorigin="anonymous">
<link rel="stylesheet" href="~/lib/bootstrap/css/bootstrap.min.css">
<link href="_content/Blazorise.Icons.FontAwesome/v6/css/all.min.css" rel="stylesheet">
<link href="_content/Blazorise/blazorise.css" rel="stylesheet" />
<link href="_content/Blazorise.Bootstrap/blazorise.bootstrap.css" rel="stylesheet" />
Expand Down Expand Up @@ -41,9 +41,21 @@
<div id="navbar">
<div id="navbar-body">
<span style="font-size: 12pt;flex-grow:1;color:white;">O'SAN Cave</span>

<a href="/" class="osan-btn" style="display: inline; width:auto;margin-right: 5px;padding: 5px 10px;"><span class="fa fa-home" /></a>
<a href="/a-propos" class="osan-btn" style="display: inline; width:auto;margin-right: 5px;padding: 5px 10px;">À propos</a>
<a href="/reservation" class="osan-btn" style="display: inline; width:auto;padding: 5px 10px;">Réserver</a>
<a href="/reservation" class="osan-btn" style="display: inline; width:auto;padding: 5px 10px;margin-right: 5px;">Réservation</a>
<a href="/livraison" class="osan-btn" style="display: inline; width:auto;padding: 5px 10px;margin-right: 5px;">Livraison</a>

<div class="dropdown">
<a class="osan-btn dropdown-toggle" href="#" role="button" data-toggle="dropdown" aria-expanded="false">

</a>

<div class="dropdown-menu dropdown-menu-right">
<a class="dropdown-item" href="/a-propos">À propos</a>
<a class="dropdown-item" href="/nos-cartes">Nos cartes</a>
</div>
</div>
</div>
</div>

Expand All @@ -60,6 +72,8 @@
</div>

<script src="~/lib/jquery/dist/jquery.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/umd/popper.min.js"></script>
<script src="~/lib/bootstrap/js/bootstrap.js"></script>

<script src="~/lib/slick-carousel/slick.min.js"></script>
<script src="~/lib/Swiper/swiper-bundle.min.js"></script>
Expand Down
4 changes: 3 additions & 1 deletion src/OsanWebsite.Web/Pages/Shared/_Sidebar.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,9 @@

<br />
<br />
<a href="/" class="osan-btn" style="margin-bottom: 10px;"><span class="fa fa-home"></span> Accueil</a>
<a href="/" class="osan-btn flexed" style="margin-bottom: 5px;"><span class="fa fa-home"></span><span class="btn-text">Accueil</span></a>
<a href="/a-propos" class="osan-btn flexed" style="margin-bottom:5px;"><span class="fa fa-circle-info"></span><span class="btn-text">À propos</span></a>
<a href="/nos-cartes" class="osan-btn flexed" style="margin-bottom:10px;"><span class="fa fa-wine-glass-empty"></span><span class="btn-text">Nos cartes</span></a>
</div>

<div style="display:flex;align-items:center;padding: 10px 0px; border-top: 1px solid #ca798f;">
Expand Down
4 changes: 4 additions & 0 deletions src/OsanWebsite.Web/libman.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@
{
"library": "[email protected]",
"destination": "wwwroot/lib/Swiper/"
},
{
"library": "[email protected]",
"destination": "wwwroot/lib/bootstrap/"
}
]
}
7 changes: 0 additions & 7 deletions src/OsanWebsite.Web/wwwroot/css/bootstrap4/bootstrap.min.css

This file was deleted.

15 changes: 15 additions & 0 deletions src/OsanWebsite.Web/wwwroot/css/site.css
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,21 @@
text-decoration: none;
}

.flexed {
display: flex;
align-items: center;
padding: 5px;
}

.flexed .fa {
font-size: 10pt;
}

.flexed .btn-text {
flex-grow: 1;
text-align: center;
}

body {
background-color: #FFFFFF;
color: #000000;
Expand Down
Binary file not shown.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/OsanWebsite.Web/wwwroot/images/livraison2.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/OsanWebsite.Web/wwwroot/images/osan2.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 578c252

Please sign in to comment.