Update master (#13)

* Dev (#3) * Update _Layout.cshtml * Update Dockerfile Co-Authored-By: akinin <[email protected]> * Delete BookEntriesViewModel.cs Co-Authored-By: akinin <[email protected]> * Delete PhoneBookService.cs Co-Authored-By: akinin <[email protected]> * Update Program.cs Co-Authored-By: akinin <[email protected]> * Update PhonebookContext.cs Co-Authored-By: akinin <[email protected]> * Update .gitignore * Added automatic application of unapplied migration * Delete libman.json * Delet databases * Update .gitignore * Update appsettings.Development.json * Update appsettings.json * Update PhoneBookController.cs Co-Authored-By: akinin <[email protected]> * Update migrations Co-Authored-By: akinin <[email protected]> * Update launchSettings.json Co-Authored-By: akinin <[email protected]> * Edit ConnectionStrings Co-Authored-By: akinin <[email protected]> * Update PhoneEdit.sln Co-Authored-By: akinin <[email protected]> * Update PhoneEdit.csproj Co-Authored-By: akinin <[email protected]> * Update Dockerfile Co-Authored-By: akinin <[email protected]> * Update PhonebookContext.cs Co-Authored-By: akinin <[email protected]> * Update .gitignore Co-Authored-By: akinin <[email protected]> * Create docker-image.yml * Update .gitignore Co-Authored-By: akinin <[email protected]> * Update dotnet.yml * Update docker-image.yml * Update README.md * Create docker-publish.yml * Update docker-publish.yml * Delete .github/workflows/docker-publish.yml * Create docker-publish.yml * Delete IdentityContext.db Co-Authored-By: akinin <[email protected]> * Delete PhoneBookContext.db Co-Authored-By: akinin <[email protected]> * Update appsettings.json Co-Authored-By: akinin <[email protected]> * Update SampleData.cs Co-Authored-By: akinin <[email protected]> * Update Program.cs Co-Authored-By: akinin <[email protected]> * Update launchSettings.json Co-Authored-By: akinin <[email protected]> * Update DefaultUserService.cs Co-Authored-By: akinin <[email protected]> * Update Index.cshtml Co-Authored-By: akinin <[email protected]> * Update buttons Co-Authored-By: akinin <[email protected]> * Delete .github/workflows/docker-publish.yml * Create docker-publish.yml * Update docker-publish.yml * Update README.md * Update README.md * Update README.md * Update README.md * Update README.md --------- Co-authored-by: akinin <[email protected]>
akinin · Dec 4, 2023 · 2ce1250 · 2ce1250
1 parent 1222655
commit 2ce1250
Show file tree

Hide file tree

Showing 110 changed files with 57,345 additions and 17,711 deletions.
diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
@@ -0,0 +1,19 @@
+name: Docker Image CI
+
+on:
+  push:
+    branches:
+      - 'master'
+      - 'dev'
+  pull_request:
+    branches: [ "master" ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v3
+      - name: Build the PhoneEdit Docker image
+        working-directory: .
+        run: docker build . --file Dockerfile --tag my-image-name:$(date +%s)
diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
@@ -0,0 +1,93 @@
+name: Docker Packages
+
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+
+on:
+  release:
+    types: [published]
+
+env:
+  # Use docker.io for Docker Hub if empty
+  REGISTRY: ${{ vars.REGISTRY }}
+
+
+jobs:
+  Build-PhoneEdit:
+    environment: PhoneEditApplication
+
+    runs-on: ubuntu-latest
+
+    permissions:
+      contents: read
+      packages: write
+      # This is used to complete the identity challenge
+      # with sigstore/fulcio when running outside of PRs.
+      id-token: write
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+
+      # Install the cosign tool except on PR
+      # https://github.com/sigstore/cosign-installer
+      - name: Install cosign
+        if: github.event_name != 'pull_request'
+        uses: sigstore/cosign-installer@6e04d228eb30da1757ee4e1dd75a0ec73a653e06 #v3.1.1
+        with:
+          cosign-release: 'v2.1.1'
+
+      # Set up BuildKit Docker container builder to be able to build
+      # multi-platform images and export cache
+      # https://github.com/docker/setup-buildx-action
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@f95db51fddba0c2d1ec667646a06c2ce06100226 # v3.0.0
+
+      # Login against a Docker registry except on PR
+      # https://github.com/docker/login-action
+      - name: Log into registry ${{ env.REGISTRY }}
+        if: github.event_name != 'pull_request'
+        uses: docker/login-action@343f7c4344506bcbf9b4de18042ae17996df046d # v3.0.0
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GH_TOKEN }}
+
+      # Extract metadata (tags, labels) for Docker
+      # https://github.com/docker/metadata-action
+      - name: Extract Docker metadata
+        id: meta
+        uses: docker/metadata-action@96383f45573cb7f253c731d3b3ab81c87ef81934 # v5.0.0
+        with:
+          images: ${{ env.REGISTRY }}/${{ github.actor }}/${{ vars.IMAGE_NAME }}
+
+      # Build and push Docker image with Buildx (don't push on PR)
+      # https://github.com/docker/build-push-action
+      - name: Build and push PhoneEdit Docker image
+        id: build-and-push
+        uses: docker/build-push-action@0565240e2d4ab88bba5387d719585280857ece09 # v5.0.0
+        with:
+          context: .
+          push: ${{ github.event_name != 'pull_request' }}
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+
+      # Sign the resulting Docker image digest except on PRs.
+      # This will only write to the public Rekor transparency log when the Docker
+      # repository is public to avoid leaking data.  If you would like to publish
+      # transparency data even for private images, pass --force to cosign below.
+      # https://github.com/sigstore/cosign
+      - name: Sign the published PhoneEdit Docker image
+        if: ${{ github.event_name != 'pull_request' }}
+        env:
+          context: .
+          # https://docs.github.com/en/actions/security-guides/security-hardening-for-github-actions#using-an-intermediate-environment-variable
+          TAGS: ${{ steps.meta.outputs.tags }}
+          DIGEST: ${{ steps.build-and-push.outputs.digest }}
+        # This step uses the identity token to provision an ephemeral certificate
+        # against the sigstore community Fulcio instance.
+        run: echo "${TAGS}" | xargs -I {} cosign sign --yes {}@${DIGEST}
diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
@@ -0,0 +1,29 @@
+# This workflow will build a .NET project
+
+name: .NET
+
+on:
+  push:
+    branches:
+      - 'master'
+      - 'dev'
+  pull_request:
+    branches: [ "master" ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: Setup .NET
+      uses: actions/setup-dotnet@v3
+      with:
+        dotnet-version: 8.0.x
+    - name: Restore dependencies
+      run: dotnet restore
+    - name: Build
+      run: dotnet build --no-restore
+    - name: Test
+      run: dotnet test --no-build --verbosity normal
diff --git a/.gitignore b/.gitignore
@@ -259,4 +259,9 @@ paket-files/
 # Python Tools for Visual Studio (PTVS)
 __pycache__/
 *.pyc
-/appsettings.json
+
+# Custom ignore rules
+.DS_Store
+*.db*
+*.db
+docker-compose.yml
diff --git a/Areas/Identity/IdentityHostingStartup.cs b/Areas/Identity/IdentityHostingStartup.cs
diff --git a/Areas/Identity/Pages/Account/Manage/_Layout.cshtml b/Areas/Identity/Pages/Account/Manage/_Layout.cshtml
@@ -1,5 +1,5 @@
 @{
-    Layout = "/Areas/Identity/Pages/_Layout.cshtml";
+    Layout = "_Layout";
 }
 
 <h1>Manage your account</h1>

diff --git a/Controllers/PhoneBookController.cs b/Controllers/PhoneBookController.cs
@@ -1,11 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Authorization.Infrastructure;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Mvc.Rendering;
 using Microsoft.EntityFrameworkCore;
 using PhoneEdit.Data;
 using PhoneEdit.Models;
@@ -25,7 +19,7 @@ public PhoneBookController(PhonebookContext context)
 
         // GET: PhoneBook
         [AllowAnonymous]
-        public async Task<IActionResult> Index(string currentFilter, string searchString, int? cPage)
+        public IActionResult Index(string? searchString, string? currentFilter, int? cPage)
         {
             if (searchString != null)
             {
@@ -38,10 +32,8 @@ public async Task<IActionResult> Index(string currentFilter, string searchString
 
             ViewBag.CurrentFilter = searchString;
 
-            var entries = from e in _context.Entries
-                select e;
-
-
+            var entries = _context.Entries.Select(e => e).AsEnumerable();
+
             if (!string.IsNullOrEmpty(searchString))
             {
                 entries = entries.Where(e => e.ToString().Contains(searchString, StringComparison.OrdinalIgnoreCase));
@@ -51,9 +43,10 @@ public async Task<IActionResult> Index(string currentFilter, string searchString
 
             int pageSize = 25;
             int pageNumber = (cPage ?? 1);
-            return View((await entries.ToListAsync()).ToPagedList(pageNumber,pageSize));
-        }
 
+            return View(entries.AsQueryable().ToPagedList(pageNumber, pageSize));
+        }
+
         // GET: PhoneBook/Details/5
         public async Task<IActionResult> Details(int? id)
         {
@@ -114,12 +107,9 @@ public async Task<IActionResult> Edit(int? id)
             return View(bookEntry);
         }
 
-        // POST: PhoneBook/Edit/5
-        // To protect from overposting attacks, please enable the specific properties you want to bind to, for 
-        // more details see http://go.microsoft.com/fwlink/?LinkId=317598.
         [HttpPost]
         [ValidateAntiForgeryToken]
-        public async Task<IActionResult> Edit(int id, [Bind("Id,PersonnelNumber,Name,Position,Department,LocalPhoneNumber,CityPhoneNumber,Mail,Room, Status")] BookEntry bookEntry)
+        public async Task<IActionResult> Edit(int id, [Bind("Id,PersonnelNumber,Name,Position,Department,LocalPhoneNumber,CityPhoneNumber,Mail,Room")] BookEntry bookEntry)
         {
             if (id != bookEntry.Id)
             {
@@ -152,7 +142,7 @@ public async Task<IActionResult> Edit(int id, [Bind("Id,PersonnelNumber,Name,Pos
             }
             return View(bookEntry);
         }
-
+        
         // GET: PhoneBook/Delete/5
         public async Task<IActionResult> Delete(int? id)
         {
@@ -186,8 +176,7 @@ private bool BookEntryExists(int id)
         {
             return _context.Entries.Any(e => e.Id == id);
         }
-
-
+
         // Valid only if personnelNumber is unique
         private bool VerifyPersonnelNumber(string personnelNumber, int id)
         {

diff --git a/Data/ApplicationDbContext.cs b/Data/ApplicationDbContext.cs
@@ -1,16 +1,12 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using Microsoft.AspNetCore.Identity.EntityFrameworkCore;
+using Microsoft.AspNetCore.Identity.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore;
 
-namespace PhoneEdit.Data
+namespace PhoneEdit.Data;
+
+public class ApplicationDbContext : IdentityDbContext
 {
-    public class ApplicationDbContext : IdentityDbContext
+    public ApplicationDbContext(DbContextOptions<ApplicationDbContext> options)
+        : base(options)
     {
-        public ApplicationDbContext(DbContextOptions<ApplicationDbContext> options)
-            : base(options)
-        {
-        }
     }
 }