diff --git a/VCart.Domain/VCart.Domain.csproj b/VCart.Domain/Blinks.Domain.csproj similarity index 100% rename from VCart.Domain/VCart.Domain.csproj rename to VCart.Domain/Blinks.Domain.csproj diff --git a/VCart.Domain/Entities/BusinessAreas.cs b/VCart.Domain/Entities/BusinessAreas.cs new file mode 100644 index 0000000..dd6719c --- /dev/null +++ b/VCart.Domain/Entities/BusinessAreas.cs @@ -0,0 +1,15 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Blinks.Domain.Entities +{ + public class BusinessAreas + { + public BusinessAreas() { } + + public string Name { get; set; } + } +} diff --git a/VCart.Domain/Entities/BusinessAres.cs b/VCart.Domain/Entities/BusinessAres.cs new file mode 100644 index 0000000..f91ad5d --- /dev/null +++ b/VCart.Domain/Entities/BusinessAres.cs @@ -0,0 +1,12 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Blinks.Domain.Entities +{ + internal class BusinessAres + { + } +} diff --git a/VCart.Domain/Entities/PersonUser.cs b/VCart.Domain/Entities/PersonUser.cs index 8eb216b..11e1a31 100644 --- a/VCart.Domain/Entities/PersonUser.cs +++ b/VCart.Domain/Entities/PersonUser.cs @@ -3,9 +3,9 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using VCart.Domain.ValueObjects; +using Blinks.Domain.ValueObjects; -namespace VCart.Domain.Entities +namespace Blinks.Domain.Entities { public class PersonUser { diff --git a/VCart.Domain/Entities/UserPlan.cs b/VCart.Domain/Entities/UserPlan.cs new file mode 100644 index 0000000..4dffacb --- /dev/null +++ b/VCart.Domain/Entities/UserPlan.cs @@ -0,0 +1,19 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Blinks.Domain.Entities +{ + public class UserPlan + { + public int Id { get; set; } + + public string Name { get; set; } + + public string Description { get; set; } + + public string UserPlanId { get; set; } + } +} diff --git a/VCart.Domain/ValueObjects/DateBirth.cs b/VCart.Domain/ValueObjects/DateBirth.cs index 6fe3df5..bce01cd 100644 --- a/VCart.Domain/ValueObjects/DateBirth.cs +++ b/VCart.Domain/ValueObjects/DateBirth.cs @@ -4,7 +4,7 @@ using System.Diagnostics.Metrics; using System.IO; using System.Reflection.Emit; -namespace VCart.Domain +namespace Blinks.Domain { public class DateBirth : AValueObject { diff --git a/VCart.Domain/ValueObjects/DateChanged.cs b/VCart.Domain/ValueObjects/DateChanged.cs index a3ef0e2..0f96921 100644 --- a/VCart.Domain/ValueObjects/DateChanged.cs +++ b/VCart.Domain/ValueObjects/DateChanged.cs @@ -2,7 +2,7 @@ using BaseDomain; using System.Globalization; -namespace VCart.Domain +namespace Blinks.Domain { public class DateChanged : AValueObject { diff --git a/VCart.Domain/ValueObjects/Email.cs b/VCart.Domain/ValueObjects/Email.cs index db07744..a86bf25 100644 --- a/VCart.Domain/ValueObjects/Email.cs +++ b/VCart.Domain/ValueObjects/Email.cs @@ -1,7 +1,7 @@ using BaseDomain; using System.Net.Mail; -namespace VCart.Domain +namespace Blinks.Domain { public class Email : AValueObject { diff --git a/VCart.Domain/ValueObjects/Id.cs b/VCart.Domain/ValueObjects/Id.cs index d0eb28a..92d6347 100644 --- a/VCart.Domain/ValueObjects/Id.cs +++ b/VCart.Domain/ValueObjects/Id.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace VCart.Domain.ValueObjects +namespace Blinks.Domain.ValueObjects { public class Id : AValueObject { diff --git a/VCart.Domain/ValueObjects/Name.cs b/VCart.Domain/ValueObjects/Name.cs index 8bb3238..5125e0d 100644 --- a/VCart.Domain/ValueObjects/Name.cs +++ b/VCart.Domain/ValueObjects/Name.cs @@ -1,6 +1,6 @@ using BaseDomain; -namespace VCart.Domain +namespace Blinks.Domain { public class Name : AValueObject { diff --git a/VCart.Domain/ValueObjects/Phone.cs b/VCart.Domain/ValueObjects/Phone.cs index 534529a..15fb16b 100644 --- a/VCart.Domain/ValueObjects/Phone.cs +++ b/VCart.Domain/ValueObjects/Phone.cs @@ -1,7 +1,7 @@ using BaseDomain; using System.Text.RegularExpressions; -namespace VCart.Domain +namespace Blinks.Domain { public class Phone : AValueObject { diff --git a/VCart.Domain/ValueObjects/Username.cs b/VCart.Domain/ValueObjects/Username.cs index ab90cce..d9a5395 100644 --- a/VCart.Domain/ValueObjects/Username.cs +++ b/VCart.Domain/ValueObjects/Username.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace VCart.Domain.ValueObjects +namespace Blinks.Domain.ValueObjects { public class Username { diff --git a/VCart.Infra/VCart.Infra.csproj b/VCart.Infra/Blinks.Infra.csproj similarity index 100% rename from VCart.Infra/VCart.Infra.csproj rename to VCart.Infra/Blinks.Infra.csproj diff --git a/VCart.Infra/MongoDB/MongoDBContext.cs b/VCart.Infra/MongoDB/MongoDBContext.cs index 1a88991..295d1b4 100644 --- a/VCart.Infra/MongoDB/MongoDBContext.cs +++ b/VCart.Infra/MongoDB/MongoDBContext.cs @@ -5,7 +5,7 @@ using System.Text; using System.Threading.Tasks; using MongoDB.Driver; -namespace VCart.Infra.MongoDB +namespace Blinks.Infra.MongoDB { public class MongoDbContext { diff --git a/VCart.Infra/MongoDB/UserPerson.cs b/VCart.Infra/MongoDB/UserPerson.cs index 0843d8d..7710f3b 100644 --- a/VCart.Infra/MongoDB/UserPerson.cs +++ b/VCart.Infra/MongoDB/UserPerson.cs @@ -1,7 +1,7 @@ using global::MongoDB.Bson.Serialization.Attributes; using global::MongoDB.Bson; -namespace VCart.Infra.MongoDB +namespace Blinks.Infra.MongoDB { public class PersonUser diff --git a/VCart/VCart.csproj b/VCart/Blinks.csproj similarity index 84% rename from VCart/VCart.csproj rename to VCart/Blinks.csproj index 68b2cf5..3d940e9 100644 --- a/VCart/VCart.csproj +++ b/VCart/Blinks.csproj @@ -21,11 +21,6 @@ - - Resource.pt-BR.resx - True - True - True True @@ -35,7 +30,6 @@ - Resource.pt-BR.Designer.cs PublicResXFileCodeGenerator diff --git a/VCart/Controllers/CartHomeController.cs b/VCart/Controllers/CartHomeController.cs index cda52d5..5e1ed80 100644 --- a/VCart/Controllers/CartHomeController.cs +++ b/VCart/Controllers/CartHomeController.cs @@ -1,6 +1,6 @@ using Microsoft.AspNetCore.Mvc; -namespace VCart.Controllers +namespace Blinks.Controllers { public class CartHomeController : Controller { diff --git a/VCart/Controllers/HomeController.cs b/VCart/Controllers/HomeController.cs index 33cb48b..2836301 100644 --- a/VCart/Controllers/HomeController.cs +++ b/VCart/Controllers/HomeController.cs @@ -1,8 +1,8 @@ using Microsoft.AspNetCore.Mvc; using System.Diagnostics; -using VCart.Models; +using Blinks.Models; -namespace VCart.Controllers +namespace Blinks.Controllers { public class HomeController : Controller { diff --git a/VCart/Controllers/LanguageController.cs b/VCart/Controllers/LanguageController.cs index 560253c..333e780 100644 --- a/VCart/Controllers/LanguageController.cs +++ b/VCart/Controllers/LanguageController.cs @@ -1,7 +1,7 @@ using Microsoft.AspNetCore.Mvc; using System.Globalization; -namespace VCart.Controllers +namespace Blinks.Controllers { public class LanguageController : Controller { diff --git a/VCart/Controllers/LoginController.cs b/VCart/Controllers/LoginController.cs index 90e00e9..edc066d 100644 --- a/VCart/Controllers/LoginController.cs +++ b/VCart/Controllers/LoginController.cs @@ -6,7 +6,7 @@ using Microsoft.AspNetCore.Authentication.Cookies; using Microsoft.AspNetCore.Authentication; using Stripe; -namespace VCart.Controllers +namespace Blinks.Controllers { public class LoginController : Controller { @@ -30,7 +30,7 @@ namespace VCart.Controllers public ActionResult ExternalLogin(string provider, string returnUrl) { var redirectUrl = Url.Action("ExternalLoginCallback", "Login", new { ReturnUrl = returnUrl }); - var properties = new AuthenticationProperties { RedirectUri = "https://localhost:44377" + redirectUrl }; + var properties = new AuthenticationProperties { RedirectUri = "http://localhost:5094" + redirectUrl }; return Challenge(properties, "Microsoft"); } @@ -39,7 +39,7 @@ namespace VCart.Controllers public ActionResult ExternalLoginGoogle(string provider, string returnUrl) { var redirectUrl = Url.Action("ExternalLoginCallback", "Login", new { ReturnUrl = returnUrl }); - var properties = new AuthenticationProperties { RedirectUri = "https://localhost:44377" + redirectUrl }; + var properties = new AuthenticationProperties { RedirectUri = "http://localhost:5094" + redirectUrl }; return Challenge(properties, "Google"); } diff --git a/VCart/Controllers/PayController.cs b/VCart/Controllers/PayController.cs new file mode 100644 index 0000000..c0227fb --- /dev/null +++ b/VCart/Controllers/PayController.cs @@ -0,0 +1,73 @@ +using Microsoft.AspNetCore.Mvc; +using Stripe; +using Stripe.Checkout; + +namespace Blinks.Controllers +{ + [Route("Pay")] + public class PayController : Controller + { + private string domain = ""; + + public PayController() + { + domain = "http://192.168.0.27:5094/"; + } + + public IActionResult Index() + { + return View(); + } + + [HttpPost("createbio")] + public ActionResult CreateBio() + { + StripeConfiguration.ApiKey = "sk_test_51PvIzkBk8jHwC3c0sGuWDUO8MV9KeOdSkir3Ulo2RZWmUhJLBIAgzxQScuomVi2l333MNmi0yr3FgeFv7OZnCJ0j00hD94yGx1"; + + var options = new SessionCreateOptions + { + UiMode = "embedded", + LineItems = new List + { + new SessionLineItemOptions + { + // Provide the exact Price ID (for example, pr_1234) of the product you want to sell + Price = "price_1Q1CXGBk8jHwC3c0YwypjEVd", + Quantity = 1, + }, + }, + Mode = "subscription", + ReturnUrl = domain + "/Plans/OrderView?SessionId={CHECKOUT_SESSION_ID}", + }; + var service = new SessionService(); + Session session = service.Create(options); + + return Json(new { clientSecret = session.ClientSecret }); + } + + [HttpPost("createcatalogo")] + public ActionResult CreateCatalogo() + { + StripeConfiguration.ApiKey = "sk_test_51PvIzkBk8jHwC3c0sGuWDUO8MV9KeOdSkir3Ulo2RZWmUhJLBIAgzxQScuomVi2l333MNmi0yr3FgeFv7OZnCJ0j00hD94yGx1"; + var options = new SessionCreateOptions + { + UiMode = "embedded", + LineItems = new List + { + new SessionLineItemOptions + { + // Provide the exact Price ID (for example, pr_1234) of the product you want to sell + Price = "price_1Q1CjvBk8jHwC3c03D82tbH8", + Quantity = 1, + }, + }, + Mode = "subscription", + ReturnUrl = domain + "/Plans/OrderView?SessionId={CHECKOUT_SESSION_ID}", + }; + var service = new SessionService(); + Session session = service.Create(options); + + return Json(new { clientSecret = session.ClientSecret }); + } + } +} diff --git a/VCart/Controllers/PlansController.cs b/VCart/Controllers/PlansController.cs index d27f60a..2ac88cb 100644 --- a/VCart/Controllers/PlansController.cs +++ b/VCart/Controllers/PlansController.cs @@ -1,63 +1,40 @@ using Microsoft.AspNetCore.Mvc; using Newtonsoft.Json; using Stripe; +using Stripe.Checkout; +using Blinks.Models; -namespace VCart.Controllers +namespace Blinks.Controllers { public class PlansController : Controller { + private string domain = ""; + + public PlansController() + { + domain = "http://192.168.0.27:5094/"; + } + public IActionResult Index() { return View(); } - [HttpPost] - public ActionResult Create(PaymentIntentCreateRequest request) + public IActionResult Pay(string ammount) { - var paymentIntentService = new PaymentIntentService(); - var paymentIntent = paymentIntentService.Create(new PaymentIntentCreateOptions - { - Amount = CalculateOrderAmount(request.Items), - Currency = "usd", - // In the latest version of the API, specifying the `automatic_payment_methods` parameter is optional because Stripe enables its functionality by default. - AutomaticPaymentMethods = new PaymentIntentAutomaticPaymentMethodsOptions - { - Enabled = true, - }, - }); - - return Json(new - { - clientSecret = paymentIntent.ClientSecret - // [DEV]: For demo purposes only, you should avoid exposing the PaymentIntent ID in the client-side code. - //dpmCheckerLink = $"https://dashboard.stripe.com/settings/payment_methods/review?transaction_id={paymentIntent.ID}" - }); + return View(); } - private long CalculateOrderAmount(Item[] items) + public IActionResult OrderView([FromQuery] string SessionId) { - // Calculate the order total on the server to prevent - // people from directly manipulating the amount on the client - long total = 0; - foreach (Item item in items) - { - total += item.Amount; - } - return total; + var sessionService = new SessionService(); + Session session = sessionService.Get(SessionId); + + ViewBag.Status = session.RawJObject["status"]; + ViewBag.CustomerEmail = session.RawJObject["customer_details"]["email"]; + //return Json(new { status = session.RawJObject["status"], customer_email = session.RawJObject["customer_details"]["email"] }); + return View(); } - public class Item - { - [JsonProperty("id")] - public string Id { get; set; } - [JsonProperty("Amount")] - public long Amount { get; set; } - } - - public class PaymentIntentCreateRequest - { - [JsonProperty("items")] - public Item[] Items { get; set; } - } } } diff --git a/VCart/Controllers/SignInController.cs b/VCart/Controllers/SignInController.cs index 5b1a9da..c1e2c98 100644 --- a/VCart/Controllers/SignInController.cs +++ b/VCart/Controllers/SignInController.cs @@ -1,7 +1,7 @@ using Microsoft.AspNetCore.Mvc; using System.Diagnostics; -namespace VCart.Controllers +namespace Blinks.Controllers { [Route("signin-microsoft")] public class SignInController : Controller diff --git a/VCart/Controllers/StartupController.cs b/VCart/Controllers/StartupController.cs index 0b0134d..85ba2ff 100644 --- a/VCart/Controllers/StartupController.cs +++ b/VCart/Controllers/StartupController.cs @@ -1,6 +1,6 @@ using Microsoft.AspNetCore.Mvc; -namespace VCart.Controllers +namespace Blinks.Controllers { public class StartupController : Controller { diff --git a/VCart/Dockerfile b/VCart/Dockerfile index 78eee1e..ea45e5f 100644 --- a/VCart/Dockerfile +++ b/VCart/Dockerfile @@ -7,16 +7,16 @@ EXPOSE 443 FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build WORKDIR /src -COPY ["VCart.csproj", "."] -RUN dotnet restore "./VCart.csproj" +COPY ["Blinks.csproj", "."] +RUN dotnet restore "./Blinks.csproj" COPY . . WORKDIR "/src/." -RUN dotnet build "VCart.csproj" -c Release -o /app/build +RUN dotnet build "Blinks.csproj" -c Release -o /app/build FROM build AS publish -RUN dotnet publish "VCart.csproj" -c Release -o /app/publish /p:UseAppHost=false +RUN dotnet publish "Blinks.csproj" -c Release -o /app/publish /p:UseAppHost=false FROM base AS final WORKDIR /app COPY --from=publish /app/publish . -ENTRYPOINT ["dotnet", "VCart.dll"] \ No newline at end of file +ENTRYPOINT ["dotnet", "Blinks.dll"] \ No newline at end of file diff --git a/VCart/Middle/RequestLocalizationMiddleware.cs b/VCart/Middle/RequestLocalizationMiddleware.cs index bdc89df..62a7e0b 100644 --- a/VCart/Middle/RequestLocalizationMiddleware.cs +++ b/VCart/Middle/RequestLocalizationMiddleware.cs @@ -1,4 +1,4 @@ -namespace VCart.Middle +namespace Blinks.Middle { using Microsoft.AspNetCore.Http; using System.Globalization; diff --git a/VCart/Models/ChangeViewModel.cs b/VCart/Models/ChangeViewModel.cs new file mode 100644 index 0000000..8b91cc3 --- /dev/null +++ b/VCart/Models/ChangeViewModel.cs @@ -0,0 +1,7 @@ +namespace Blinks.Models +{ + public class ChangeViewModel + { + public string ChargeId { get; set; } + } +} diff --git a/VCart/Models/ErrorViewModel.cs b/VCart/Models/ErrorViewModel.cs index cffc97f..755301c 100644 --- a/VCart/Models/ErrorViewModel.cs +++ b/VCart/Models/ErrorViewModel.cs @@ -1,4 +1,4 @@ -namespace VCart.Models +namespace Blinks.Models { public class ErrorViewModel { diff --git a/VCart/Models/Payment.cs b/VCart/Models/Payment.cs new file mode 100644 index 0000000..ce8aae5 --- /dev/null +++ b/VCart/Models/Payment.cs @@ -0,0 +1,9 @@ +namespace Blinks.Models +{ + public class Payment + { + public int Amount { get; set; } + public string Currency { get; set; } + public string Description { get; set; } + } +} diff --git a/VCart/NewReport2.upgrade.json b/VCart/NewReport2.upgrade.json index 1d1342c..a0aa5b9 100644 --- a/VCart/NewReport2.upgrade.json +++ b/VCart/NewReport2.upgrade.json @@ -32,7 +32,7 @@ }, "projects": [ { - "path": "VCart.csproj", + "path": "Blinks.csproj", "startingProject": true, "issues": 1, "storyPoints": 1, @@ -40,7 +40,7 @@ { "incidentId": "1161414d-b2e4-4447-9d34-e811b563e1c5", "ruleId": "NuGet.0001", - "projectPath": "VCart.csproj", + "projectPath": "Blinks.csproj", "state": "Active", "location": { "snippetModel": { @@ -48,7 +48,7 @@ "protected": "Microsoft.VisualStudio.Azure.Containers.Tools.Targets, 1.19.4\n\nRecommendation:\n\nNo supported version found" }, "kind": "File", - "path": "VCart.csproj", + "path": "Blinks.csproj", "snippet": "Microsoft.VisualStudio.Azure.Containers.Tools.Targets, 1.19.4\n\nRecommendation:\n\nNo supported version found", "protectedSnippet": "Microsoft.VisualStudio.Azure.Containers.Tools.Targets, 1.19.4\n\nRecommendation:\n\nNo supported version found", "label": "Microsoft.VisualStudio.Azure.Containers.Tools.Targets 1.19.4" @@ -57,7 +57,7 @@ ] }, { - "path": "C:\\vscode\\vcart.me.mvc\\VCart.Domain\\VCart.Domain.csproj", + "path": "C:\\vscode\\Blinks.me.mvc\\Blinks.Domain\\Blinks.Domain.csproj", "startingProject": true, "issues": 1, "storyPoints": 1, @@ -65,7 +65,7 @@ { "incidentId": "2fdd89a6-9f8d-4428-8845-41d048dcaf73", "ruleId": "Project.0002", - "projectPath": "C:\\vscode\\vcart.me.mvc\\VCart.Domain\\VCart.Domain.csproj", + "projectPath": "C:\\vscode\\Blinks.me.mvc\\Blinks.Domain\\Blinks.Domain.csproj", "state": "Active", "location": { "snippetModel": { @@ -73,7 +73,7 @@ "protected": "Current: net7.0\nNew: net8.0" }, "kind": "File", - "path": "C:\\vscode\\vcart.me.mvc\\VCart.Domain\\VCart.Domain.csproj", + "path": "C:\\vscode\\Blinks.me.mvc\\Blinks.Domain\\Blinks.Domain.csproj", "snippet": "Current: net7.0\nNew: net8.0", "protectedSnippet": "Current: net7.0\nNew: net8.0" } diff --git a/VCart/Program.cs b/VCart/Program.cs index 22cf153..5fa2042 100644 --- a/VCart/Program.cs +++ b/VCart/Program.cs @@ -1,9 +1,11 @@ using Microsoft.AspNetCore.Authentication.Cookies; +using Microsoft.AspNetCore.Authentication.Google; using Microsoft.AspNetCore.Authentication.MicrosoftAccount; using Microsoft.AspNetCore.Localization; using Microsoft.AspNetCore.Mvc.Razor; using Microsoft.Extensions.Options; using Stripe; +using Stripe.Forwarding; using System.Globalization; var builder = WebApplication.CreateBuilder(args); @@ -50,8 +52,8 @@ builder.Services.Configure(options => { var supportedCultures = new List { - new CultureInfo("en"), - new CultureInfo("pt-BR") + new CultureInfo("pt-BR"), + new CultureInfo("en") }; options.DefaultRequestCulture = new RequestCulture("pt-BR"); @@ -91,5 +93,6 @@ app.MapControllerRoute( name: "default", pattern: "{controller=Home}/{action=Index}/{id?}"); +app.UseRequestLocalization(); app.Run(); diff --git a/VCart/Properties/launchSettings.json b/VCart/Properties/launchSettings.json index bf3ed30..24f44d9 100644 --- a/VCart/Properties/launchSettings.json +++ b/VCart/Properties/launchSettings.json @@ -7,7 +7,7 @@ "ASPNETCORE_ENVIRONMENT": "Development" }, "dotnetRunMessages": true, - "applicationUrl": "http://192.168.0.27:5094" + "applicationUrl": "http://localhost:5094" }, "https": { "commandName": "Project", diff --git a/VCart/Resource.Designer.cs b/VCart/Resource.Designer.cs index c6bb7d9..f184f70 100644 --- a/VCart/Resource.Designer.cs +++ b/VCart/Resource.Designer.cs @@ -8,7 +8,7 @@ // //------------------------------------------------------------------------------ -namespace VCart { +namespace Blinks { using System; @@ -39,7 +39,7 @@ namespace VCart { public static global::System.Resources.ResourceManager ResourceManager { get { if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("VCart.Resource", typeof(Resource).Assembly); + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Blinks.Resource", typeof(Resource).Assembly); resourceMan = temp; } return resourceMan; diff --git a/VCart/Resource.pt-BR.Designer.cs b/VCart/Resource.pt-BR.Designer.cs index 54f176f..f5d60b4 100644 --- a/VCart/Resource.pt-BR.Designer.cs +++ b/VCart/Resource.pt-BR.Designer.cs @@ -8,7 +8,7 @@ // //------------------------------------------------------------------------------ -namespace VCart { +namespace Blinks { using System; diff --git a/VCart/VCart.sln b/VCart/VCart.sln index 1dcd324..860e1e1 100644 --- a/VCart/VCart.sln +++ b/VCart/VCart.sln @@ -3,13 +3,13 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 VisualStudioVersion = 17.7.34031.279 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VCart", "VCart.csproj", "{51C3E6BC-4BBC-429F-9A7F-8C8A14E14DF4}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Blinks", "Blinks.csproj", "{51C3E6BC-4BBC-429F-9A7F-8C8A14E14DF4}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VCart.Domain", "..\VCart.Domain\VCart.Domain.csproj", "{83471C51-B081-4FAC-B5D3-24B237DEC339}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Blinks.Domain", "..\VCart.Domain\Blinks.Domain.csproj", "{83471C51-B081-4FAC-B5D3-24B237DEC339}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BaseDomain", "..\..\vcart.me\vcart.back\Struct.ValueObjects\BaseDomain.csproj", "{083273D7-7AE9-48A0-A59F-7CC03E1B4C30}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VCart.Infra", "..\VCart.Infra\VCart.Infra.csproj", "{82C3179D-BE8C-4B83-95F4-32B86448D5AC}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Blinks.Infra", "..\VCart.Infra\Blinks.Infra.csproj", "{82C3179D-BE8C-4B83-95F4-32B86448D5AC}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/VCart/Views/Home/Carousel1.cshtml b/VCart/Views/Home/Carousel1.cshtml index f505aaa..b337c48 100644 --- a/VCart/Views/Home/Carousel1.cshtml +++ b/VCart/Views/Home/Carousel1.cshtml @@ -126,7 +126,7 @@ -@section Style { +@section Styles { - - - -
-
-
-
-
-@* - - *@ - -
-
-
-@* -
-
-
- -
- -
-
-
- -
- -
-
-
- - -
-
- -
- *@ -
- @using (Html.BeginForm("ExternalLogin", "Login", new { provider = "Microsoft" }, FormMethod.Post, true, new { id = "externalLoginForm" })) - { - @Html.AntiForgeryToken() - -
- } -
-
- @using (Html.BeginForm("ExternalLoginGoogle", "Login", new { provider = "Google" }, FormMethod.Post, true, new { id = "externalLoginForm" })) - { - @Html.AntiForgeryToken() - - } -
-
-
-
- Don't have an account? Sign Up -
-
- Forgot your password? +} + +
+
+
+
+
+
+
+
+
+
+
+
+
+ @using (Html.BeginForm("ExternalLogin", "Login", new { provider = "Microsoft" }, FormMethod.Post, true, new { id = "externalLoginForm", style = "margin-left: 150px" })) + { + @Html.AntiForgeryToken() + + } +
+ @using (Html.BeginForm("ExternalLoginGoogle", "Login", new { provider = "Google" }, FormMethod.Post, true, new { id = "externalLoginForm", style = "margin-left: 150px" })) + { + @Html.AntiForgeryToken() + + }
-
- - diff --git a/VCart/Views/Pay/Index.cshtml b/VCart/Views/Pay/Index.cshtml new file mode 100644 index 0000000..7c703fc --- /dev/null +++ b/VCart/Views/Pay/Index.cshtml @@ -0,0 +1,45 @@ +@* + For more information on enabling MVC for empty projects, visit https://go.microsoft.com/fwlink/?LinkID=397860 +*@ +@{ +} + +@section Scripts { + + +} +
+
+
+ +
+ diff --git a/VCart/Views/Plans/Index.cshtml b/VCart/Views/Plans/Index.cshtml index c0505f2..ffe33d9 100644 --- a/VCart/Views/Plans/Index.cshtml +++ b/VCart/Views/Plans/Index.cshtml @@ -1,8 +1,9 @@ @{ + ViewBag.Title = "Planos"; }
-
+
@@ -13,93 +14,87 @@ Básico
    -
  • 1 Bio/Cartão pessoal virtual
    • -
  • Exibir cartão Whatsapp *
    • -
  • Até 20 links
    • +
  • 1 Bio/Links pessoal virtual
    • +
  • Exibir imagem Whatsapp *
    • +
  • Até 3 links
  • Sem página de Produtos
    • -
  • Links agendados **
    • -
  • Contador de Visualizações
    • -
  • Registro de Contatos
    • -
+
  • Sem contador de Visualizações
    • +
    - Assinar +
    Plano Atual
    -
    +
    -
    +
    R$13 por mês
    - Comum + BIO +
    +
      +
    • 1 Bio/Links pessoal virtual
      • +
    • Exibir cartão Whatsapp *
      • +
    • 100 links
      • +
    • Sem página de Produtos
      • +@* +
    • 1 Link agendado **
      • + *@ +
    • Contador de Visualizações
      • +@* +
    • Registro de contatos
      • + *@ +
    +
    + @if (User.Identity.IsAuthenticated) + { + Assinar + } + else + { + Login / Registro + } +
    +
    +
    +
    +
    +
    +
    +
    + R$27 + por mês +
    +
    + CATÁLOGO
    • 1 Bio/Cartão pessoal virtual
    • Exibir cartão Whatsapp *
      • -
    • Sem limite de links
      • -
    • 1 Página de produto
      • -
    • 1 Link agendado **
      • -
    • Contador de visualizações
      • -
    • Registro de contatos
      • -
    -
    - Assinar -
    -
    -
    -
    -
    -
    -
    -
    - R$30 - por mês -
    -
    - Super -
    -
      -
    • 300 Bio/Cartões pessoal virtual
      • -
    • Exibir cartão Whatsapp *
    • Sem limite de links
      • -
    • 300 Produtos
      • -
    • Use links agendados **
      • +
    • Links de Produtos
    • Contador de visualizações
      • +@*
    • Registro de contatos
      • + *@
    + @if (User.Identity.IsAuthenticated) + { + - Assinar -
    -
    -
    -
    -
    -
    -
    -
    - R$55 - por mês -
    -
    - Empresas -
    -
      -
    • 300 Bio/Cartões pessoal virtual
      • -
    • Exibir cartão Whatsapp *
      • -
    • Sem limite de links
      • -
    • 300 Produtos
      • -
    • Use links agendados **
      • -
    • Contador de visualizações
      • -
    • Registro de contatos
      • -
    -
    - - Assinar +@* + Assinar + *@ + } + else + { + Login / Registro + }
    diff --git a/VCart/Views/Plans/Index.cshtml.css b/VCart/Views/Plans/Index.cshtml.css index b4c5463..ce32725 100644 --- a/VCart/Views/Plans/Index.cshtml.css +++ b/VCart/Views/Plans/Index.cshtml.css @@ -11,15 +11,15 @@ License: MIT BACKGROUND COLORS ============================================================*/ .db-bk-color-one { - background-color: #e1f2e6; + background-color: #A9B595; } .db-bk-color-two { - background-color: burlywood; + background-color: #B9CEA0; } .db-bk-color-three { - background-color: darkseagreen; + background-color: #97A47E; } .db-bk-color-six { @@ -51,6 +51,7 @@ BACKGROUND COLORS margin-top: 50px; text-align: center; box-shadow: 0 0 5px rgba(0, 0, 0, .5); + border-radius: 7px 7px 7px 7px; color: #101211; line-height: 30px; } @@ -74,19 +75,19 @@ BACKGROUND COLORS .db-pricing-eleven .price { - background-color: rgba(0, 0, 0, 0.5); + background-color: rgba(0, 0, 0, 0); color: #FFFFFF; } .db-pricing-eleven .price small { - color: #B8B8B8; + color: #63783F; display: block; font-size: 12px; margin-top: 22px; } .db-pricing-eleven .type { - background-color: #52E89E; + background-color: #63783F; padding: 50px 20px; font-weight: 900; text-transform: uppercase; diff --git a/VCart/Views/Plans/OrderView.cshtml b/VCart/Views/Plans/OrderView.cshtml new file mode 100644 index 0000000..6aa270a --- /dev/null +++ b/VCart/Views/Plans/OrderView.cshtml @@ -0,0 +1,10 @@ +@model ChangeViewModel +@{ + ViewBag.Title = "OrederStatus"; +} +

    Order Status

    +

    @ViewBag.Status

    + +

    Email

    +

    @ViewBag.Email

    + diff --git a/VCart/Views/Plans/Pay - Copy.cshtml b/VCart/Views/Plans/Pay - Copy.cshtml new file mode 100644 index 0000000..82bf5cb --- /dev/null +++ b/VCart/Views/Plans/Pay - Copy.cshtml @@ -0,0 +1,77 @@ +@* + For more information on enabling MVC for empty projects, visit https://go.microsoft.com/fwlink/?LinkID=397860 +*@ +@{ +} + + +@section Scripts { + + +} + +
    +
    +
    +
    + Credit Card Information +
    +
    +
    +
    +
    + +
    +
    +
    +
    + +
    +
    +
    +
    + +
    +
    +
    +
    + +
    +
    + +
    +
    +
    +
    \ No newline at end of file diff --git a/VCart/Views/Plans/Pay.cshtml b/VCart/Views/Plans/Pay.cshtml new file mode 100644 index 0000000..ebf7a30 --- /dev/null +++ b/VCart/Views/Plans/Pay.cshtml @@ -0,0 +1,44 @@ +@* + For more information on enabling MVC for empty projects, visit https://go.microsoft.com/fwlink/?LinkID=397860 +*@ +@{ +} + +@section Scripts { + + +} + +
    + +
    + diff --git a/VCart/Views/Shared/_Language.cshtml b/VCart/Views/Shared/_Language.cshtml index d0f33aa..50d9e5e 100644 --- a/VCart/Views/Shared/_Language.cshtml +++ b/VCart/Views/Shared/_Language.cshtml @@ -4,7 +4,7 @@ @{ } -
  • +
    • - @if (!User.Identity.IsAuthenticated) + @if (User!=null && User.Identity!=null && !User.Identity.IsAuthenticated) {
      @@ -45,10 +45,10 @@ else {
        - +
      • Sair @@ -80,18 +80,21 @@
        - + - + @await RenderSectionAsync("Scripts", required: false) diff --git a/VCart/Views/Shared/_Layout.cshtml.css b/VCart/Views/Shared/_Layout.cshtml.css index a0a9377..3fb7eac 100644 --- a/VCart/Views/Shared/_Layout.cshtml.css +++ b/VCart/Views/Shared/_Layout.cshtml.css @@ -13,12 +13,16 @@ a { .btn-primary { color: #fff; - background-color: #1b6ec2; + background-color: #63783F; border-color: #1861ac; } .nav-pills .nav-link.active, .nav-pills .show > .nav-link { + /* color: #fff; + +*/ + color: black !important; background-color: #1b6ec2; border-color: #1861ac; } @@ -116,7 +120,7 @@ button.accept-policy { } .btn-primary { - background-color: #00ff21; + background-color: #63783F; } .navbar-inner { @@ -156,22 +160,36 @@ button.accept-policy { } } -.navbar .navbar-collapse ul.navbar-nav .nav-item.active { - color: white; - background-color: #00ff21 !important; +.navbar .navbar-collapse ul.navbar-nav .nav-item { + padding-left: 3px; + padding-right: 3px; } -a.nav-link.text-white { - background-color: green; +.navbar .navbar-collapse ul.navbar-nav .nav-item.active { + color: white; + padding-left: 3px; + padding-right: 3px; + background-color: #C7CCB8 !important; + border-radius: 7px 7px 7px 7px; + /* + background-color: #b8f2a1 !important; + + */ +} + +a.nav-link.text-black { + color: black !important; } nav.link .active { - background-color: red; - color: darkgreen; + color: black !important; } #nav-bar { - background-color: darkgreen; + background-color: #63783F +/* background-color: #darkgreen; +*/ + } #searchLi > a { @@ -183,6 +201,10 @@ nav.link .active { color: darkred; } +.text-black { + color: black !important; +} + .btn.green { background-color: darkgreen; color: white; diff --git a/VCart/Views/SignIn/Index.cshtml b/VCart/Views/SignIn/Index.cshtml index aa0ee62..e411335 100644 --- a/VCart/Views/SignIn/Index.cshtml +++ b/VCart/Views/SignIn/Index.cshtml @@ -11,7 +11,7 @@ - VCart + Blinks diff --git a/VCart/Views/Startup/Index.cshtml b/VCart/Views/Startup/Index.cshtml index b87bb20..2f45d70 100644 --- a/VCart/Views/Startup/Index.cshtml +++ b/VCart/Views/Startup/Index.cshtml @@ -1,4 +1,4 @@ -@using VCart +@using Blinks @* For more information on enabling MVC for empty projects, visit https://go.microsoft.com/fwlink/?LinkID=397860 @@ -7,7 +7,7 @@ ViewData["Title"] = "Form Example"; } -@section Style { +@section Styles {