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
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 2 additions & 2 deletions .github/instructions/csharp.instructions.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
applyTo: '**/*.cs'
---

1. ALWAYS wrap blocks with braces `{}` even for single-line statements.
1. ALWAYS wrap blocks with braces `{}` even for single-line statements!!
1. ALWAYS use the filesystem to determine namespace names.
1. PREFER to use records for classes with properties and no methods.
1. AVOID using regions (`#region` / `#endregion`).
1. NEVER use regions (`#region` / `#endregion`).
1. AVOID writing docstrings for small methods that are self-explanatory.
1. AVOID adding unnecessary empty lines.
1. When Nuget packages are modified, the docker containers must be rebuilt.
Expand Down
3 changes: 2 additions & 1 deletion .github/instructions/frontend.instructions.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@ applyTo: '**/client-app/**'
---

1. PREFER send server data as JSON instead of forms.
1. PREFER writing functional React components using hooks.
1. PREFER writing functional React components using hooks.
1. Use Autosuggest NPM library for input fields with suggestions.
30 changes: 22 additions & 8 deletions .github/workflows/main_kooktime.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Docs for the Azure Web Apps Deploy action: https://go.microsoft.com/fwlink/?linkid=2134798
# More GitHub Actions for Azure: https://go.microsoft.com/fwlink/?linkid=2135048

name: Azure App Service - kooktime(Production), Build and deploy DotnetCore app
name: CI/CD

on:
push:
Expand All @@ -12,11 +12,30 @@ on:
- main

jobs:
build-and-deploy:
test:
runs-on: ubuntu-latest

steps:
# checkout the repo
- name: "Checkout Github Action"
uses: actions/checkout@master

- name: Set up .NET Core
uses: actions/setup-dotnet@v1
with:
dotnet-version: "10.0.x"

- name: Server
run: scripts/server

- name: Test
run: scripts/test

deploy:
runs-on: ubuntu-latest
needs: test
if: github.event_name == 'push' && github.ref == 'refs/heads/main'

steps:
- name: "Checkout Github Action"
uses: actions/checkout@master

Expand All @@ -28,15 +47,10 @@ jobs:
- name: Build
run: scripts/build

# - name: Test
# run: scripts/test

- name: Publish
if: github.event_name == 'push' && github.ref == 'refs/heads/main'
run: scripts/publish ${{env.DOTNET_ROOT}}/myapp

- name: Run Azure webapp deploy action using publish profile credentials
if: github.event_name == 'push' && github.ref == 'refs/heads/main'
uses: azure/webapps-deploy@v2
with:
app-name: kooktime
Expand Down
51 changes: 0 additions & 51 deletions .vscode/launch.json

This file was deleted.

46 changes: 0 additions & 46 deletions .vscode/react.code-snippets

This file was deleted.

3 changes: 1 addition & 2 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
{
"dotnet.defaultSolution": "babe-algorithms.sln",
"cmake.configureOnOpen": false
"dotnet.defaultSolution": "src/CookTime.sln",
}
50 changes: 0 additions & 50 deletions .vscode/tasks.json

This file was deleted.

2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Added

- User custom lists feature: users can now create, manage, and delete their own named recipe lists
- Tests!

### Changed

- Made authentication cookie persist for longer, helps mobile Safari
- Reorganized the source code so it's all under `src`
5 changes: 5 additions & 0 deletions Directory.Build.props
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<Project>
<PropertyGroup>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
</PropertyGroup>
</Project>
Loading