From c076377166370c32d68bf4cdf46c1df1b5abf683 Mon Sep 17 00:00:00 2001 From: Wade Barnes Date: Tue, 28 Apr 2020 07:06:20 -0700 Subject: [PATCH] Rename component directories - Rename associated project files. - Remove the `scv-` to make the project naming more generic. - Retain the `scv-` prefix for the image names to distinguish them from other images. - Update gitignore with standard files from GitHub --- .gitignore | 495 +++++++++++++++++- Docker/api/Dockerfile | 4 +- SCV.sln | 4 +- .../Controllers/ValuesController.cs | 0 {scv-api => api}/Program.cs | 52 +- .../Properties/launchSettings.json | 64 +-- {scv-api => api}/Startup.cs | 126 ++--- scv-api/scv-api.csproj => api/api.csproj | 18 +- {scv-api => api}/appsettings.Development.json | 6 +- {scv-api => api}/appsettings.json | 20 +- docker/manage | 4 +- {scv-web => web}/.dockerignore | 0 {scv-web => web}/.env | 0 {scv-web => web}/.s2iignore | 0 {scv-web => web}/README.md | 0 {scv-web => web}/babel.config.js | 0 {scv-web => web}/nginx.conf | 0 {scv-web => web}/package-lock.json | 0 {scv-web => web}/package.json | 0 {scv-web => web}/postcss.config.js | 0 {scv-web => web}/public/favicon.ico | Bin .../public/images/bcid-192x192.png | Bin .../public/images/bcid-512x512.png | Bin .../public/images/bcid-apple-icon.svg | 0 .../public/images/bcid-apple-touch-icon.png | Bin .../public/images/bcid-favicon-16x16.png | Bin .../public/images/bcid-favicon-32x32.png | Bin .../public/images/bcid-logo-en.svg | 0 .../public/images/bcid-logo-fr.svg | 0 .../public/images/bcid-logo-rev-en.svg | 0 .../public/images/bcid-logo-rev-fr.svg | 0 .../public/images/bcid-mstile-144x144.png | Bin .../public/images/bcid-mstile-150x150.png | Bin .../public/images/bcid-mstile-310x150.png | Bin .../public/images/bcid-mstile-310x310.png | Bin .../public/images/bcid-mstile-70x70.png | Bin .../public/images/bcid-symbol-rev.svg | 0 .../public/images/bcid-symbol.svg | 0 {scv-web => web}/public/index.html | 0 {scv-web => web}/src/App.vue | 0 {scv-web => web}/src/assets/bc-logo.svg | 0 {scv-web => web}/src/assets/landing.jpg | Bin {scv-web => web}/src/assets/logo.png | Bin .../src/components/HelloWorld.vue | 0 {scv-web => web}/src/components/Home.vue | 0 .../src/components/NavigationFooter.vue | 0 .../src/components/NavigationTopbar.vue | 0 {scv-web => web}/src/main.ts | 0 {scv-web => web}/src/router/index.ts | 0 {scv-web => web}/src/shims-tsx.d.ts | 0 {scv-web => web}/src/shims-vue.d.ts | 0 {scv-web => web}/src/store/index.ts | 0 {scv-web => web}/src/styles/_common.scss | 0 {scv-web => web}/src/styles/_survey.scss | 0 {scv-web => web}/src/styles/_variables.scss | 0 {scv-web => web}/src/styles/index.scss | 0 {scv-web => web}/src/views/About.vue | 0 {scv-web => web}/src/views/Home.vue | 0 {scv-web => web}/src/views/SampleAPI.vue | 0 {scv-web => web}/tsconfig.json | 0 scv-web/scv-web.njsproj => web/web.njsproj | 0 61 files changed, 622 insertions(+), 171 deletions(-) rename {scv-api => api}/Controllers/ValuesController.cs (100%) rename {scv-api => api}/Program.cs (96%) rename {scv-api => api}/Properties/launchSettings.json (96%) rename {scv-api => api}/Startup.cs (96%) rename scv-api/scv-api.csproj => api/api.csproj (95%) rename {scv-api => api}/appsettings.Development.json (98%) rename {scv-api => api}/appsettings.json (94%) rename {scv-web => web}/.dockerignore (100%) rename {scv-web => web}/.env (100%) rename {scv-web => web}/.s2iignore (100%) rename {scv-web => web}/README.md (100%) rename {scv-web => web}/babel.config.js (100%) rename {scv-web => web}/nginx.conf (100%) rename {scv-web => web}/package-lock.json (100%) rename {scv-web => web}/package.json (100%) rename {scv-web => web}/postcss.config.js (100%) rename {scv-web => web}/public/favicon.ico (100%) rename {scv-web => web}/public/images/bcid-192x192.png (100%) rename {scv-web => web}/public/images/bcid-512x512.png (100%) rename {scv-web => web}/public/images/bcid-apple-icon.svg (100%) rename {scv-web => web}/public/images/bcid-apple-touch-icon.png (100%) rename {scv-web => web}/public/images/bcid-favicon-16x16.png (100%) rename {scv-web => web}/public/images/bcid-favicon-32x32.png (100%) rename {scv-web => web}/public/images/bcid-logo-en.svg (100%) rename {scv-web => web}/public/images/bcid-logo-fr.svg (100%) rename {scv-web => web}/public/images/bcid-logo-rev-en.svg (100%) rename {scv-web => web}/public/images/bcid-logo-rev-fr.svg (100%) rename {scv-web => web}/public/images/bcid-mstile-144x144.png (100%) rename {scv-web => web}/public/images/bcid-mstile-150x150.png (100%) rename {scv-web => web}/public/images/bcid-mstile-310x150.png (100%) rename {scv-web => web}/public/images/bcid-mstile-310x310.png (100%) rename {scv-web => web}/public/images/bcid-mstile-70x70.png (100%) rename {scv-web => web}/public/images/bcid-symbol-rev.svg (100%) rename {scv-web => web}/public/images/bcid-symbol.svg (100%) rename {scv-web => web}/public/index.html (100%) rename {scv-web => web}/src/App.vue (100%) rename {scv-web => web}/src/assets/bc-logo.svg (100%) rename {scv-web => web}/src/assets/landing.jpg (100%) rename {scv-web => web}/src/assets/logo.png (100%) rename {scv-web => web}/src/components/HelloWorld.vue (100%) rename {scv-web => web}/src/components/Home.vue (100%) rename {scv-web => web}/src/components/NavigationFooter.vue (100%) rename {scv-web => web}/src/components/NavigationTopbar.vue (100%) rename {scv-web => web}/src/main.ts (100%) rename {scv-web => web}/src/router/index.ts (100%) rename {scv-web => web}/src/shims-tsx.d.ts (100%) rename {scv-web => web}/src/shims-vue.d.ts (100%) rename {scv-web => web}/src/store/index.ts (100%) rename {scv-web => web}/src/styles/_common.scss (100%) rename {scv-web => web}/src/styles/_survey.scss (100%) rename {scv-web => web}/src/styles/_variables.scss (100%) rename {scv-web => web}/src/styles/index.scss (100%) rename {scv-web => web}/src/views/About.vue (100%) rename {scv-web => web}/src/views/Home.vue (100%) rename {scv-web => web}/src/views/SampleAPI.vue (100%) rename {scv-web => web}/tsconfig.json (100%) rename scv-web/scv-web.njsproj => web/web.njsproj (100%) diff --git a/.gitignore b/.gitignore index 245c8bc9..5bc247d2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,31 +1,482 @@ -**/bin -**/obj -**/node_modules -**/packages -**/.vs +# Visual Studio Code +.vscode + +## Ignore Visual Studio temporary files, build results, and +## files generated by popular Visual Studio add-ons. +## +## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore + +# User-specific files +*.rsuser +*.suo +*.user +*.userosscache +*.sln.docstates + +# User-specific files (MonoDevelop/Xamarin Studio) +*.userprefs + +# Mono auto generated files +mono_crash.* + +# Build results +[Dd]ebug/ +[Dd]ebugPublic/ +[Rr]elease/ +[Rr]eleases/ +x64/ +x86/ +[Ww][Ii][Nn]32/ +[Aa][Rr][Mm]/ +[Aa][Rr][Mm]64/ +bld/ +[Bb]in/ +[Oo]bj/ +[Ll]og/ +[Ll]ogs/ + +# Visual Studio 2015/2017 cache/options directory +.vs/ +# Uncomment if you have tasks that create the project's static files in wwwroot +#wwwroot/ + +# Visual Studio 2017 auto generated files +Generated\ Files/ + +# MSTest test Results +[Tt]est[Rr]esult*/ +[Bb]uild[Ll]og.* + +# NUnit +*.VisualState.xml +TestResult.xml +nunit-*.xml + +# Build Results of an ATL Project +[Dd]ebugPS/ +[Rr]eleasePS/ +dlldata.c + +# Benchmark Results +BenchmarkDotNet.Artifacts/ + +# .NET Core +project.lock.json +project.fragment.lock.json +artifacts/ + +# ASP.NET Scaffolding +ScaffoldingReadMe.txt + +# StyleCop +StyleCopReport.xml + +# Files built by Visual Studio +*_i.c +*_p.c +*_h.h +*.ilk +*.meta +*.obj +*.iobj +*.pch +*.pdb +*.ipdb +*.pgc +*.pgd +*.rsp +*.sbr +*.tlb +*.tli +*.tlh +*.tmp +*.tmp_proj +*_wpftmp.csproj +*.log +*.vspscc +*.vssscc +.builds +*.pidb +*.svclog +*.scc + +# Chutzpah Test files +_Chutzpah* + +# Visual C++ cache files +ipch/ +*.aps +*.ncb +*.opendb +*.opensdf +*.sdf +*.cachefile +*.VC.db +*.VC.VC.opendb + +# Visual Studio profiler +*.psess +*.vsp +*.vspx +*.sap + +# Visual Studio Trace Files +*.e2e + +# TFS 2012 Local Workspace +$tf/ + +# Guidance Automation Toolkit +*.gpState + +# ReSharper is a .NET coding add-in +_ReSharper*/ +*.[Rr]e[Ss]harper +*.DotSettings.user + +# TeamCity is a build add-in +_TeamCity* + +# DotCover is a Code Coverage Tool +*.dotCover + +# AxoCover is a Code Coverage Tool +.axoCover/* +!.axoCover/settings.json + +# Coverlet is a free, cross platform Code Coverage Tool +coverage*[.json, .xml, .info] + +# Visual Studio code coverage results +*.coverage +*.coveragexml + +# NCrunch +_NCrunch_* +.*crunch*.local.xml +nCrunchTemp_* + +# MightyMoose +*.mm.* +AutoTest.Net/ + +# Web workbench (sass) +.sass-cache/ + +# Installshield output folder +[Ee]xpress/ + +# DocProject is a documentation generator add-in +DocProject/buildhelp/ +DocProject/Help/*.HxT +DocProject/Help/*.HxC +DocProject/Help/*.hhc +DocProject/Help/*.hhk +DocProject/Help/*.hhp +DocProject/Help/Html2 +DocProject/Help/html + +# Click-Once directory +publish/ + +# Publish Web Output +*.[Pp]ublish.xml +*.azurePubxml +# Note: Comment the next line if you want to checkin your web deploy settings, +# but database connection strings (with potential passwords) will be unencrypted +*.pubxml +*.publishproj + +# Microsoft Azure Web App publish settings. Comment the next line if you want to +# checkin your Azure Web App publish settings, but sensitive information contained +# in these scripts will be unencrypted +PublishScripts/ + +# NuGet Packages +*.nupkg +# NuGet Symbol Packages +*.snupkg +# The packages folder can be ignored because of Package Restore +**/[Pp]ackages/* +# except build/, which is used as an MSBuild target. +!**/[Pp]ackages/build/ +# Uncomment if necessary however generally it will be regenerated when needed +#!**/[Pp]ackages/repositories.config +# NuGet v3's project.json files produces more ignorable files +*.nuget.props +*.nuget.targets + +# Microsoft Azure Build Output +csx/ +*.build.csdef + +# Microsoft Azure Emulator +ecf/ +rcf/ + +# Windows Store app package directories and files +AppPackages/ +BundleArtifacts/ +Package.StoreAssociation.xml +_pkginfo.txt +*.appx +*.appxbundle +*.appxupload + +# Visual Studio cache files +# files ending in .cache can be ignored +*.[Cc]ache +# but keep track of directories ending in .cache +!?*.[Cc]ache/ + +# Others +ClientBin/ +~$* +*~ +*.dbmdl +*.dbproj.schemaview +*.jfm +*.pfx +*.publishsettings +orleans.codegen.cs + +# Including strong name files can present a security risk +# (https://github.com/github/gitignore/pull/2483#issue-259490424) +#*.snk + +# Since there are multiple workflows, uncomment next line to ignore bower_components +# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) +#bower_components/ + +# RIA/Silverlight projects +Generated_Code/ + +# Backup & report files from converting an old project file +# to a newer Visual Studio version. Backup files are not needed, +# because we have git ;-) +_UpgradeReport_Files/ +Backup*/ +UpgradeLog*.XML +UpgradeLog*.htm +ServiceFabricBackup/ +*.rptproj.bak + +# SQL Server files +*.mdf +*.ldf +*.ndf + +# Business Intelligence projects +*.rdl.data +*.bim.layout +*.bim_*.settings +*.rptproj.rsuser +*- [Bb]ackup.rdl +*- [Bb]ackup ([0-9]).rdl +*- [Bb]ackup ([0-9][0-9]).rdl + +# Microsoft Fakes +FakesAssemblies/ + +# GhostDoc plugin setting file +*.GhostDoc.xml -scv-api/[Bb]in/ -scv-api/[Oo]bj/ -scv-web/.DS_Store -scv-web/node_modules -scv-web/dist +# Node.js Tools for Visual Studio +.ntvs_analysis.dat +node_modules/ +# Visual Studio 6 build log +*.plg -# local env files -.env.local -.env.*.local +# Visual Studio 6 workspace options file +*.opt -# Log files +# Visual Studio 6 auto-generated workspace file (contains which files were open etc.) +*.vbw + +# Visual Studio LightSwitch build output +**/*.HTMLClient/GeneratedArtifacts +**/*.DesktopClient/GeneratedArtifacts +**/*.DesktopClient/ModelManifest.xml +**/*.Server/GeneratedArtifacts +**/*.Server/ModelManifest.xml +_Pvt_Extensions + +# Paket dependency manager +.paket/paket.exe +paket-files/ + +# FAKE - F# Make +.fake/ + +# CodeRush personal settings +.cr/personal + +# Python Tools for Visual Studio (PTVS) +__pycache__/ +*.pyc + +# Cake - Uncomment if you are using it +# tools/** +# !tools/packages.config + +# Tabs Studio +*.tss + +# Telerik's JustMock configuration file +*.jmconfig + +# BizTalk build output +*.btp.cs +*.btm.cs +*.odx.cs +*.xsd.cs + +# OpenCover UI analysis results +OpenCover/ + +# Azure Stream Analytics local run output +ASALocalRun/ + +# MSBuild Binary and Structured Log +*.binlog + +# NVidia Nsight GPU debugger configuration file +*.nvuser + +# MFractors (Xamarin productivity tool) working folder +.mfractor/ + +# Local History for Visual Studio +.localhistory/ + +# BeatPulse healthcheck temp database +healthchecksdb + +# Backup folder for Package Reference Convert tool in Visual Studio 2017 +MigrationBackup/ + +# Ionide (cross platform F# VS Code tools) working folder +.ionide/ + +# Fody - auto-generated XML schema +FodyWeavers.xsd + +## Ignore Node temporary files, build results, and +## +## Get latest from https://github.com/github/gitignore/blob/master/Node.gitignore +# Logs +logs +*.log npm-debug.log* yarn-debug.log* yarn-error.log* +lerna-debug.log* -# Editor directories and files -.idea -*.user -*.suo -*.ntvs* -*.sw? +# Diagnostic reports (https://nodejs.org/api/report.html) +report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json -# Visual Studio Code -scv-api/.vscode \ No newline at end of file +# Runtime data +pids +*.pid +*.seed +*.pid.lock + +# Directory for instrumented libs generated by jscoverage/JSCover +lib-cov + +# Coverage directory used by tools like istanbul +coverage +*.lcov + +# nyc test coverage +.nyc_output + +# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files) +.grunt + +# Bower dependency directory (https://bower.io/) +bower_components + +# node-waf configuration +.lock-wscript + +# Compiled binary addons (https://nodejs.org/api/addons.html) +build/Release + +# Dependency directories +node_modules/ +jspm_packages/ + +# Snowpack dependency directory (https://snowpack.dev/) +web_modules/ + +# TypeScript cache +*.tsbuildinfo + +# Optional npm cache directory +.npm + +# Optional eslint cache +.eslintcache + +# Microbundle cache +.rpt2_cache/ +.rts2_cache_cjs/ +.rts2_cache_es/ +.rts2_cache_umd/ + +# Optional REPL history +.node_repl_history + +# Output of 'npm pack' +*.tgz + +# Yarn Integrity file +.yarn-integrity + +# dotenv environment variables file +.env +.env.test + +# parcel-bundler cache (https://parceljs.org/) +.cache +.parcel-cache + +# Next.js build output +.next + +# Nuxt.js build / generate output +.nuxt +dist + +# Gatsby files +.cache/ +# Comment in the public line in if your project uses Gatsby and not Next.js +# https://nextjs.org/blog/next-9-1#public-directory-support +# public + +# vuepress build output +.vuepress/dist + +# Serverless directories +.serverless/ + +# FuseBox cache +.fusebox/ + +# DynamoDB Local files +.dynamodb/ + +# TernJS port file +.tern-port + +# Stores VSCode versions used for testing VSCode extensions +.vscode-test + +# yarn v2 + +.yarn/cache +.yarn/unplugged +.yarn/build-state.yml +.pnp.* \ No newline at end of file diff --git a/Docker/api/Dockerfile b/Docker/api/Dockerfile index 88c5db59..0718f74d 100644 --- a/Docker/api/Dockerfile +++ b/Docker/api/Dockerfile @@ -2,7 +2,7 @@ FROM mcr.microsoft.com/dotnet/core/sdk:3.1 as build WORKDIR /src -COPY scv-api.csproj . +COPY api.csproj . RUN dotnet restore COPY . . @@ -26,4 +26,4 @@ ENV CORS_DOMAIN http://localhost:8080 COPY --from=build /dist . -CMD ["dotnet", "scv-api.dll"] +CMD ["dotnet", "api.dll"] diff --git a/SCV.sln b/SCV.sln index 9a47538f..6721d850 100644 --- a/SCV.sln +++ b/SCV.sln @@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.30011.22 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "scv-api", "scv-api\scv-api.csproj", "{46FE5ADD-2BAF-47D0-BB0B-912F9ED4F743}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "api", "api\api.csproj", "{46FE5ADD-2BAF-47D0-BB0B-912F9ED4F743}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Docker", "Docker", "{55D908F8-6228-4A1C-9862-E6930DEB336C}" ProjectSection(SolutionItems) = preProject @@ -12,7 +12,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Docker", "Docker", "{55D908 docker\Dockerfile-web = docker\Dockerfile-web EndProjectSection EndProject -Project("{9092AA53-FB77-4645-B42D-1CCCA6BD08BD}") = "scv-web", "scv-web\scv-web.njsproj", "{B73D5408-1350-4C28-95D6-6977B2306E32}" +Project("{9092AA53-FB77-4645-B42D-1CCCA6BD08BD}") = "web", "web\web.njsproj", "{B73D5408-1350-4C28-95D6-6977B2306E32}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/scv-api/Controllers/ValuesController.cs b/api/Controllers/ValuesController.cs similarity index 100% rename from scv-api/Controllers/ValuesController.cs rename to api/Controllers/ValuesController.cs diff --git a/scv-api/Program.cs b/api/Program.cs similarity index 96% rename from scv-api/Program.cs rename to api/Program.cs index e7541c2c..8adc9afe 100644 --- a/scv-api/Program.cs +++ b/api/Program.cs @@ -1,26 +1,26 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Hosting; -using Microsoft.Extensions.Configuration; -using Microsoft.Extensions.Hosting; -using Microsoft.Extensions.Logging; - -namespace scv_api -{ - public class Program - { - public static void Main(string[] args) - { - CreateHostBuilder(args).Build().Run(); - } - - public static IHostBuilder CreateHostBuilder(string[] args) => - Host.CreateDefaultBuilder(args) - .ConfigureWebHostDefaults(webBuilder => - { - webBuilder.UseStartup(); - }); - } -} +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Hosting; +using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.Hosting; +using Microsoft.Extensions.Logging; + +namespace scv_api +{ + public class Program + { + public static void Main(string[] args) + { + CreateHostBuilder(args).Build().Run(); + } + + public static IHostBuilder CreateHostBuilder(string[] args) => + Host.CreateDefaultBuilder(args) + .ConfigureWebHostDefaults(webBuilder => + { + webBuilder.UseStartup(); + }); + } +} diff --git a/scv-api/Properties/launchSettings.json b/api/Properties/launchSettings.json similarity index 96% rename from scv-api/Properties/launchSettings.json rename to api/Properties/launchSettings.json index ee1b6ded..9a898fcf 100644 --- a/scv-api/Properties/launchSettings.json +++ b/api/Properties/launchSettings.json @@ -1,32 +1,32 @@ -{ - "$schema": "http://json.schemastore.org/launchsettings.json", - "iisSettings": { - "windowsAuthentication": false, - "anonymousAuthentication": true, - "iisExpress": { - "applicationUrl": "http://localhost:9877", - "sslPort": 44369 - } - }, - "profiles": { - "IIS Express": { - "commandName": "IISExpress", - "launchBrowser": true, - "launchUrl": "api/values", - "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development", - "CORS_DOMAIN": "http://localhost:1337" - } - }, - "scv_api": { - "commandName": "Project", - "launchBrowser": true, - "launchUrl": "api/values", - "applicationUrl": "https://localhost:5001;http://localhost:5000", - "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development", - "CORS_DOMAIN": "http://localhost:8080" - } - } - } -} +{ + "$schema": "http://json.schemastore.org/launchsettings.json", + "iisSettings": { + "windowsAuthentication": false, + "anonymousAuthentication": true, + "iisExpress": { + "applicationUrl": "http://localhost:9877", + "sslPort": 44369 + } + }, + "profiles": { + "IIS Express": { + "commandName": "IISExpress", + "launchBrowser": true, + "launchUrl": "api/values", + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development", + "CORS_DOMAIN": "http://localhost:1337" + } + }, + "scv_api": { + "commandName": "Project", + "launchBrowser": true, + "launchUrl": "api/values", + "applicationUrl": "https://localhost:5001;http://localhost:5000", + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development", + "CORS_DOMAIN": "http://localhost:8080" + } + } + } +} diff --git a/scv-api/Startup.cs b/api/Startup.cs similarity index 96% rename from scv-api/Startup.cs rename to api/Startup.cs index 846bf387..dfa8fc86 100644 --- a/scv-api/Startup.cs +++ b/api/Startup.cs @@ -1,63 +1,63 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Builder; -using Microsoft.AspNetCore.Hosting; -using Microsoft.AspNetCore.HttpsPolicy; -using Microsoft.AspNetCore.Mvc; -using Microsoft.Extensions.Configuration; -using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Hosting; -using Microsoft.Extensions.Logging; - -namespace scv_api -{ - public class Startup - { - public Startup(IConfiguration configuration) - { - Configuration = configuration; - } - - public IConfiguration Configuration { get; } - - // This method gets called by the runtime. Use this method to add services to the container. - public void ConfigureServices(IServiceCollection services) - { - string CORS_DOMAIN = Configuration.GetValue("CORS_DOMAIN"); - Console.WriteLine($"CORS_DOMAIN: {CORS_DOMAIN}"); - - services.AddCors(options => - { - options.AddDefaultPolicy(builder => - { - builder.WithOrigins(CORS_DOMAIN); - }); - }); - - services.AddControllers(); - } - - // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. - public void Configure(IApplicationBuilder app, IWebHostEnvironment env) - { - if (env.IsDevelopment()) - { - app.UseDeveloperExceptionPage(); - } - app.UseCors(); - - app.UseHttpsRedirection(); - - app.UseRouting(); - - app.UseAuthorization(); - - app.UseEndpoints(endpoints => - { - endpoints.MapControllers(); - }); - } - } -} +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Hosting; +using Microsoft.AspNetCore.HttpsPolicy; +using Microsoft.AspNetCore.Mvc; +using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Hosting; +using Microsoft.Extensions.Logging; + +namespace scv_api +{ + public class Startup + { + public Startup(IConfiguration configuration) + { + Configuration = configuration; + } + + public IConfiguration Configuration { get; } + + // This method gets called by the runtime. Use this method to add services to the container. + public void ConfigureServices(IServiceCollection services) + { + string CORS_DOMAIN = Configuration.GetValue("CORS_DOMAIN"); + Console.WriteLine($"CORS_DOMAIN: {CORS_DOMAIN}"); + + services.AddCors(options => + { + options.AddDefaultPolicy(builder => + { + builder.WithOrigins(CORS_DOMAIN); + }); + }); + + services.AddControllers(); + } + + // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. + public void Configure(IApplicationBuilder app, IWebHostEnvironment env) + { + if (env.IsDevelopment()) + { + app.UseDeveloperExceptionPage(); + } + app.UseCors(); + + app.UseHttpsRedirection(); + + app.UseRouting(); + + app.UseAuthorization(); + + app.UseEndpoints(endpoints => + { + endpoints.MapControllers(); + }); + } + } +} diff --git a/scv-api/scv-api.csproj b/api/api.csproj similarity index 95% rename from scv-api/scv-api.csproj rename to api/api.csproj index 6f4369b4..d086dd58 100644 --- a/scv-api/scv-api.csproj +++ b/api/api.csproj @@ -1,9 +1,9 @@ - - - - netcoreapp3.1 - scv_api - - - - + + + + netcoreapp3.1 + scv_api + + + + diff --git a/scv-api/appsettings.Development.json b/api/appsettings.Development.json similarity index 98% rename from scv-api/appsettings.Development.json rename to api/appsettings.Development.json index dba68eb1..8983e0fc 100644 --- a/scv-api/appsettings.Development.json +++ b/api/appsettings.Development.json @@ -1,9 +1,9 @@ { "Logging": { "LogLevel": { - "Default": "Information", - "Microsoft": "Warning", - "Microsoft.Hosting.Lifetime": "Information" + "Default": "Information", + "Microsoft": "Warning", + "Microsoft.Hosting.Lifetime": "Information" } } } diff --git a/scv-api/appsettings.json b/api/appsettings.json similarity index 94% rename from scv-api/appsettings.json rename to api/appsettings.json index 81ff8777..d9d9a9bf 100644 --- a/scv-api/appsettings.json +++ b/api/appsettings.json @@ -1,10 +1,10 @@ -{ - "Logging": { - "LogLevel": { - "Default": "Information", - "Microsoft": "Warning", - "Microsoft.Hosting.Lifetime": "Information" - } - }, - "AllowedHosts": "*" -} +{ + "Logging": { + "LogLevel": { + "Default": "Information", + "Microsoft": "Warning", + "Microsoft.Hosting.Lifetime": "Information" + } + }, + "AllowedHosts": "*" +} diff --git a/docker/manage b/docker/manage index fb0aa05e..fdb4dedd 100755 --- a/docker/manage +++ b/docker/manage @@ -42,12 +42,12 @@ exit 1 buildImages(){ docker build \ - -f './api/Dockerfile' '../scv-api/' \ + -f './api/Dockerfile' '../api/' \ -t 'scv-api' echo -e docker build \ - -f './web/Dockerfile' '../scv-web/' \ + -f './web/Dockerfile' '../web/' \ -t 'scv-web' echo -e } diff --git a/scv-web/.dockerignore b/web/.dockerignore similarity index 100% rename from scv-web/.dockerignore rename to web/.dockerignore diff --git a/scv-web/.env b/web/.env similarity index 100% rename from scv-web/.env rename to web/.env diff --git a/scv-web/.s2iignore b/web/.s2iignore similarity index 100% rename from scv-web/.s2iignore rename to web/.s2iignore diff --git a/scv-web/README.md b/web/README.md similarity index 100% rename from scv-web/README.md rename to web/README.md diff --git a/scv-web/babel.config.js b/web/babel.config.js similarity index 100% rename from scv-web/babel.config.js rename to web/babel.config.js diff --git a/scv-web/nginx.conf b/web/nginx.conf similarity index 100% rename from scv-web/nginx.conf rename to web/nginx.conf diff --git a/scv-web/package-lock.json b/web/package-lock.json similarity index 100% rename from scv-web/package-lock.json rename to web/package-lock.json diff --git a/scv-web/package.json b/web/package.json similarity index 100% rename from scv-web/package.json rename to web/package.json diff --git a/scv-web/postcss.config.js b/web/postcss.config.js similarity index 100% rename from scv-web/postcss.config.js rename to web/postcss.config.js diff --git a/scv-web/public/favicon.ico b/web/public/favicon.ico similarity index 100% rename from scv-web/public/favicon.ico rename to web/public/favicon.ico diff --git a/scv-web/public/images/bcid-192x192.png b/web/public/images/bcid-192x192.png similarity index 100% rename from scv-web/public/images/bcid-192x192.png rename to web/public/images/bcid-192x192.png diff --git a/scv-web/public/images/bcid-512x512.png b/web/public/images/bcid-512x512.png similarity index 100% rename from scv-web/public/images/bcid-512x512.png rename to web/public/images/bcid-512x512.png diff --git a/scv-web/public/images/bcid-apple-icon.svg b/web/public/images/bcid-apple-icon.svg similarity index 100% rename from scv-web/public/images/bcid-apple-icon.svg rename to web/public/images/bcid-apple-icon.svg diff --git a/scv-web/public/images/bcid-apple-touch-icon.png b/web/public/images/bcid-apple-touch-icon.png similarity index 100% rename from scv-web/public/images/bcid-apple-touch-icon.png rename to web/public/images/bcid-apple-touch-icon.png diff --git a/scv-web/public/images/bcid-favicon-16x16.png b/web/public/images/bcid-favicon-16x16.png similarity index 100% rename from scv-web/public/images/bcid-favicon-16x16.png rename to web/public/images/bcid-favicon-16x16.png diff --git a/scv-web/public/images/bcid-favicon-32x32.png b/web/public/images/bcid-favicon-32x32.png similarity index 100% rename from scv-web/public/images/bcid-favicon-32x32.png rename to web/public/images/bcid-favicon-32x32.png diff --git a/scv-web/public/images/bcid-logo-en.svg b/web/public/images/bcid-logo-en.svg similarity index 100% rename from scv-web/public/images/bcid-logo-en.svg rename to web/public/images/bcid-logo-en.svg diff --git a/scv-web/public/images/bcid-logo-fr.svg b/web/public/images/bcid-logo-fr.svg similarity index 100% rename from scv-web/public/images/bcid-logo-fr.svg rename to web/public/images/bcid-logo-fr.svg diff --git a/scv-web/public/images/bcid-logo-rev-en.svg b/web/public/images/bcid-logo-rev-en.svg similarity index 100% rename from scv-web/public/images/bcid-logo-rev-en.svg rename to web/public/images/bcid-logo-rev-en.svg diff --git a/scv-web/public/images/bcid-logo-rev-fr.svg b/web/public/images/bcid-logo-rev-fr.svg similarity index 100% rename from scv-web/public/images/bcid-logo-rev-fr.svg rename to web/public/images/bcid-logo-rev-fr.svg diff --git a/scv-web/public/images/bcid-mstile-144x144.png b/web/public/images/bcid-mstile-144x144.png similarity index 100% rename from scv-web/public/images/bcid-mstile-144x144.png rename to web/public/images/bcid-mstile-144x144.png diff --git a/scv-web/public/images/bcid-mstile-150x150.png b/web/public/images/bcid-mstile-150x150.png similarity index 100% rename from scv-web/public/images/bcid-mstile-150x150.png rename to web/public/images/bcid-mstile-150x150.png diff --git a/scv-web/public/images/bcid-mstile-310x150.png b/web/public/images/bcid-mstile-310x150.png similarity index 100% rename from scv-web/public/images/bcid-mstile-310x150.png rename to web/public/images/bcid-mstile-310x150.png diff --git a/scv-web/public/images/bcid-mstile-310x310.png b/web/public/images/bcid-mstile-310x310.png similarity index 100% rename from scv-web/public/images/bcid-mstile-310x310.png rename to web/public/images/bcid-mstile-310x310.png diff --git a/scv-web/public/images/bcid-mstile-70x70.png b/web/public/images/bcid-mstile-70x70.png similarity index 100% rename from scv-web/public/images/bcid-mstile-70x70.png rename to web/public/images/bcid-mstile-70x70.png diff --git a/scv-web/public/images/bcid-symbol-rev.svg b/web/public/images/bcid-symbol-rev.svg similarity index 100% rename from scv-web/public/images/bcid-symbol-rev.svg rename to web/public/images/bcid-symbol-rev.svg diff --git a/scv-web/public/images/bcid-symbol.svg b/web/public/images/bcid-symbol.svg similarity index 100% rename from scv-web/public/images/bcid-symbol.svg rename to web/public/images/bcid-symbol.svg diff --git a/scv-web/public/index.html b/web/public/index.html similarity index 100% rename from scv-web/public/index.html rename to web/public/index.html diff --git a/scv-web/src/App.vue b/web/src/App.vue similarity index 100% rename from scv-web/src/App.vue rename to web/src/App.vue diff --git a/scv-web/src/assets/bc-logo.svg b/web/src/assets/bc-logo.svg similarity index 100% rename from scv-web/src/assets/bc-logo.svg rename to web/src/assets/bc-logo.svg diff --git a/scv-web/src/assets/landing.jpg b/web/src/assets/landing.jpg similarity index 100% rename from scv-web/src/assets/landing.jpg rename to web/src/assets/landing.jpg diff --git a/scv-web/src/assets/logo.png b/web/src/assets/logo.png similarity index 100% rename from scv-web/src/assets/logo.png rename to web/src/assets/logo.png diff --git a/scv-web/src/components/HelloWorld.vue b/web/src/components/HelloWorld.vue similarity index 100% rename from scv-web/src/components/HelloWorld.vue rename to web/src/components/HelloWorld.vue diff --git a/scv-web/src/components/Home.vue b/web/src/components/Home.vue similarity index 100% rename from scv-web/src/components/Home.vue rename to web/src/components/Home.vue diff --git a/scv-web/src/components/NavigationFooter.vue b/web/src/components/NavigationFooter.vue similarity index 100% rename from scv-web/src/components/NavigationFooter.vue rename to web/src/components/NavigationFooter.vue diff --git a/scv-web/src/components/NavigationTopbar.vue b/web/src/components/NavigationTopbar.vue similarity index 100% rename from scv-web/src/components/NavigationTopbar.vue rename to web/src/components/NavigationTopbar.vue diff --git a/scv-web/src/main.ts b/web/src/main.ts similarity index 100% rename from scv-web/src/main.ts rename to web/src/main.ts diff --git a/scv-web/src/router/index.ts b/web/src/router/index.ts similarity index 100% rename from scv-web/src/router/index.ts rename to web/src/router/index.ts diff --git a/scv-web/src/shims-tsx.d.ts b/web/src/shims-tsx.d.ts similarity index 100% rename from scv-web/src/shims-tsx.d.ts rename to web/src/shims-tsx.d.ts diff --git a/scv-web/src/shims-vue.d.ts b/web/src/shims-vue.d.ts similarity index 100% rename from scv-web/src/shims-vue.d.ts rename to web/src/shims-vue.d.ts diff --git a/scv-web/src/store/index.ts b/web/src/store/index.ts similarity index 100% rename from scv-web/src/store/index.ts rename to web/src/store/index.ts diff --git a/scv-web/src/styles/_common.scss b/web/src/styles/_common.scss similarity index 100% rename from scv-web/src/styles/_common.scss rename to web/src/styles/_common.scss diff --git a/scv-web/src/styles/_survey.scss b/web/src/styles/_survey.scss similarity index 100% rename from scv-web/src/styles/_survey.scss rename to web/src/styles/_survey.scss diff --git a/scv-web/src/styles/_variables.scss b/web/src/styles/_variables.scss similarity index 100% rename from scv-web/src/styles/_variables.scss rename to web/src/styles/_variables.scss diff --git a/scv-web/src/styles/index.scss b/web/src/styles/index.scss similarity index 100% rename from scv-web/src/styles/index.scss rename to web/src/styles/index.scss diff --git a/scv-web/src/views/About.vue b/web/src/views/About.vue similarity index 100% rename from scv-web/src/views/About.vue rename to web/src/views/About.vue diff --git a/scv-web/src/views/Home.vue b/web/src/views/Home.vue similarity index 100% rename from scv-web/src/views/Home.vue rename to web/src/views/Home.vue diff --git a/scv-web/src/views/SampleAPI.vue b/web/src/views/SampleAPI.vue similarity index 100% rename from scv-web/src/views/SampleAPI.vue rename to web/src/views/SampleAPI.vue diff --git a/scv-web/tsconfig.json b/web/tsconfig.json similarity index 100% rename from scv-web/tsconfig.json rename to web/tsconfig.json diff --git a/scv-web/scv-web.njsproj b/web/web.njsproj similarity index 100% rename from scv-web/scv-web.njsproj rename to web/web.njsproj