Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Uncomment header modal #156

Merged
merged 2 commits into from
Mar 3, 2023
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
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 7 additions & 9 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Continuous Integration (Packaging) pipeline
# purpose: Continuous Integration (build, test, lint, scan)

name: CI

Expand All @@ -21,29 +21,27 @@ jobs:
name: Build
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@master

- name: Checkout repository
uses: actions/checkout@v3
- name: Install Node.js (LTS)
uses: actions/setup-node@v3
with:
node-version: 18
- name: Setup node_modules cache
id: cache-nodemodules
uses: actions/cache@v3
env:
cache-name: cache-node-modules
with:
# cache node_modules to improve performance dramatically
path: node_modules
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}

- name: Install dependencies
run: npm install

- name: Build
run: npm run build:prod
env:
NODE_OPTIONS: '--openssl-legacy-provider'

# TODO: lint, sonar, tests

- name: Create container image
run: |
docker build -f .github/workflows/Dockerfile-ci -t hobbyfarm/admin-ui:${GIT_COMMIT_SHORT_HASH:-dev} .
5 changes: 2 additions & 3 deletions src/app/header/header.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,7 @@
</clr-dropdown>
</div>


<!-- <clr-modal #logoutmodal [(clrModalOpen)]="logoutModalOpened">
<clr-modal #logoutmodal [(clrModalOpen)]="logoutModalOpened">
<h3 class="modal-title">Confirm Logout</h3>
<div class="modal-body">
<p>
Expand All @@ -51,4 +50,4 @@ <h3 class="modal-title">About HobbyFarm</h3>
<i>UI Version: {{version}}</i>
</p>
</div>
</clr-modal> -->
</clr-modal>