Merge pull request #155 from gctools-outilsgc/event-page

Event page ignore-deploy
gctools-outilsgc · Aug 30, 2023 · 7e3a476 · 7e3a476
2 parents 5162731 + 038d44e
commit 7e3a476
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 8 deletions.
diff --git a/.github/workflows/deploy-pr.yml b/.github/workflows/deploy-pr.yml
@@ -6,6 +6,7 @@ on:
   pull_request:
     types: [opened, reopened] # TODO: synchronize
     branches: main
+
 
 env:
   AZURE_WEBAPP_NAME: gccollab-dev-pr-${{ github.event.number }}
@@ -19,8 +20,9 @@ jobs:
   setup:
     name: Deploy Bicep
     runs-on: ubuntu-latest
+    if: ${{ !contains(github.event.pull_request.title, vars.IGNORE_DEPLOY) }}
     steps:
-      - uses: actions/checkout@main
+      - uses: actions/checkout@v3
       - uses: azure/login@v1
         with:
           creds: ${{ secrets.AZURE_CREDENTIALS }}
@@ -40,6 +42,7 @@ jobs:
     name: Store Publishing Profile
     runs-on: ubuntu-latest
     needs: setup
+    if: ${{ !contains(github.event.pull_request.title, vars.IGNORE_DEPLOY) }}
     steps:
       - name: Azure Login
         uses: azure/login@v1
@@ -56,7 +59,7 @@ jobs:
         shell: bash
         run: gh auth login --with-token <<< ${{ env.ACCESS_TOKEN }}
 
-      - uses: actions/checkout@main
+      - uses: actions/checkout@v3
       - name: Create Secret
         run: |
           escaped_profile=$(printf "%q" "${{ env.PROFILE }}")
@@ -68,6 +71,7 @@ jobs:
     name: Create Environment 
     runs-on: ubuntu-latest
     needs: [setup, store]
+    if: ${{ !contains(github.event.pull_request.title, vars.IGNORE_DEPLOY) }}
     steps:
       - name: Create Environment
         shell: bash
@@ -85,6 +89,7 @@ jobs:
     name: Build, Test and Deploy
     runs-on: windows-latest
     needs: [setup, store, create-environment]
+    if: ${{ !contains(github.event.pull_request.title, vars.IGNORE_DEPLOY) }}
     environment: 
       name: PR ${{ github.event.number }}
       url: https://${{ env.AZURE_WEBAPP_NAME }}.azurewebsites.net/

diff --git a/.github/workflows/destroy-pr.yml b/.github/workflows/destroy-pr.yml
@@ -16,6 +16,7 @@ jobs:
   azure:
     name: Delete Azure Resources
     runs-on: ubuntu-latest
+    if: ${{ !contains(github.event.pull_request.title, vars.IGNORE_DEPLOY) }}
     steps:
       - uses: azure/login@v1
         with:
@@ -30,18 +31,20 @@ jobs:
   secret:
     name: Delete GitHub Secret
     runs-on: ubuntu-latest
+    if: ${{ !contains(github.event.pull_request.title, vars.IGNORE_DEPLOY) }}
     steps:
       - name: GitHub Auth Login
         shell: bash
         run: gh auth login --with-token <<< ${{ env.ACCESS_TOKEN }}
 
-      - uses: actions/checkout@main
+      - uses: actions/checkout@v3
       - name: Delete Secret
         run: gh secret delete "${{ env.SECRET_NAME }}"
 
   environment:
     name: Delete GitHub Environment 
     runs-on: ubuntu-latest
+    if: ${{ !contains(github.event.pull_request.title, vars.IGNORE_DEPLOY) }}
     steps:
       - name: Delete Environment
         shell: bash

diff --git a/src/app/features/events/components/event/event.component.html b/src/app/features/events/components/event/event.component.html
@@ -79,6 +79,8 @@ <h3>
             <ngx-skeleton-loader *ngIf="loading" count="2" appearance="line" animation="progress" class="loading-section"></ngx-skeleton-loader>
         </section>
 
+        <div class="section-separator"></div>
+
         <!-- Location -->
         <i class="fa fa-map-marker"></i>
         <section>
@@ -94,6 +96,8 @@ <h3>
             <ngx-skeleton-loader *ngIf="loading" count="2" appearance="line" animation="progress" class="loading-section"></ngx-skeleton-loader>
         </section>
 
+        <div class="section-separator"></div>
+
         <!-- Host -->
         <i class="fa-user-circle fa-regular"></i>
         <section>

diff --git a/src/app/features/events/components/event/event.component.scss b/src/app/features/events/components/event/event.component.scss
@@ -102,6 +102,13 @@ $calendar-size: 120px;
                 }
             }
 
+            .section-separator {
+                height: 40px;
+                margin-top: 30px;
+                flex-grow: 0.5;
+                border-left: 2px solid $neutral-300;
+            }
+
             ngx-skeleton-loader {
                 display: block;
                 width: 80%;

diff --git a/src/app/features/events/events-routing.module.ts b/src/app/features/events/events-routing.module.ts
@@ -4,8 +4,6 @@ import { EventsComponent } from './events.component';
 
 import { Translations } from 'src/app/core/services/translations.service';
 import { EventComponent } from './components/event/event.component';
-import { Banner } from 'src/app/shared/components/banner/banner.component';
-import { EventResolver } from './resolvers/event.resolver';
 
 let translations = Translations.getInstance();
 
@@ -19,9 +17,6 @@ const routes: Routes = [
     path: ':id',
     title: translations.titles.event,
     component: EventComponent,
-    // resolve: {
-    //   event: EventResolver
-    // },
     data: {
       title: translations.titles.event, 
       breadcrumb: translations.titles.event