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

[fixinventory][chore] FixInventory -> Fix Inventory #1952

Merged
merged 1 commit into from
Feb 28, 2024
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
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ body:
id: version
attributes:
label: Version
description: What version of FixInventory are you running?
description: What version of Fix Inventory are you running?
validations:
required: true
- type: input
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.fixinventorybase
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ RUN echo "I am running on ${BUILDPLATFORM}, building for ${TARGETPLATFORM}"
# Prepare whl build env
RUN mkdir -p /build /build-python

# Build FixInventory
# Build Fix Inventory
COPY requirements-extra.txt /usr/src/requirements-extra.txt
COPY fixlib /usr/src/fixlib
COPY fixcore /usr/src/fixcore
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ services:
- FIX_LOG_TEXT
- FIXCORE_ANALYTICS_OPT_OUT
- FIXCORE_GRAPHDB_SERVER=http://graphdb:8529
# FixInventory will create a new database and user with this password using the root account
# Fix Inventory will create a new database and user with this password using the root account
- FIXCORE_GRAPHDB_PASSWORD=changeme
command:
- --override
Expand Down
2 changes: 1 addition & 1 deletion dockerV2/fixsh-wait
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ main() {
trap shutdown SIGINT SIGTERM
trap 'error_handler $? $LINENO $BASH_LINENO "$BASH_COMMAND" $(printf "::%s" ${FUNCNAME[@]}); trap - ERR' ERR
while [ $run = true ]; do
info "Connect to this container and execute 'fixsh' to start the FixInventory shell"
info "Connect to this container and execute 'fixsh' to start the Fix Inventory shell"
sleep 900 || true
done
else
Expand Down
2 changes: 1 addition & 1 deletion fixcore/fixcore/static/api-doc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ servers:
- url: ../
description: current system
info:
title: FixInventory Core REST API
title: Fix Inventory Core REST API
version: V1
tags:
- name: graph_search
Expand Down
10 changes: 5 additions & 5 deletions fixcore/fixcore/templates/create_first_user.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

<main class="form-group w-100 m-auto">
<div class="d-flex flex-column min-vh-100 justify-content-center align-items-center">
<img src="/static/fix_logo_and_text.svg" width="400" class="mb-3" alt="FixInventory"/>
<img src="/static/fix_logo_and_text.svg" width="400" class="mb-3" alt="Fix Inventory"/>
<form action="/create-first-user" method="post" enctype="multipart/form-data">
<h1 class="h3 mb-3 fw-normal">Create Account</h1>
{% if error %}
Expand All @@ -21,14 +21,14 @@ <h1 class="h3 mb-3 fw-normal">Create Account</h1>
<div class="col-sm-10">
<input id="company" name="company" type="text" class="form-control" placeholder="Some Corporation Inc." value="{{ company }}" required>
</div>
<small class="form-text text-muted">Company Name this instance is registered. Visible in the UI for all users.</small>
<small class="form-text text-muted">Company to which this instance is registered. Visible to users in the UI.</small>
</div>
<div class="form-group row mb-4">
<label for="fullname" class="col-sm-2 col-form-label">Full Name</label>
<div class="col-sm-10">
<input id="fullname" name="fullname" type="text" class="form-control" placeholder="Jane Doe" value="{{ fullname }}" required>
</div>
<small class="form-text text-muted">Name associated with this user. Will be shown in the UI.</small>
<small class="form-text text-muted">Name associated with this user. Visible in the UI.</small>
</div>
<div class="form-group row mb-4">
<label for="email" class="col-sm-2 col-form-label">Work Email</label>
Expand All @@ -46,10 +46,10 @@ <h1 class="h3 mb-3 fw-normal">Create Account</h1>
<div class="col-sm-10">
<input id="password_repeat" name="password_repeat" type="password" class="form-control" value="{{ password_repeat }}" placeholder="Your password again" required>
</div>
<small class="form-text text-muted">Your password to access your FixInventory installation.</small>
<small class="form-text text-muted">Password to access your Fix Inventory installation.</small>
</div>
<div class="form-group row mb-4">
<small class="form-text text-center">By submitting this form you accept <a href="https://inventory.fix.security/terms">Terms and Conditions</a>.</small>
<small class="form-text text-center">By submitting this form, you accept the <a href="https://inventory.fix.security/terms">Fix Inventory terms and conditions</a>.</small>
</div>
<input name="redirect" type="hidden" value="{{ redirect }}">
<button class="w-100 btn btn-lg btn-primary" type="submit">Create User</button>
Expand Down
8 changes: 4 additions & 4 deletions fixcore/fixcore/templates/login.html
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{% extends "base.html" %}
{% block title %}
Login to FixInventory
Log in to Fix Inventory
{% endblock %}

{% block content %}

<main class="form-signin w-100 m-auto">
<div class="d-flex flex-column min-vh-100 justify-content-center align-items-center text-center">
<img src="/static/fix_logo_and_text.svg" width="400" class="mb-3" alt="FixInventory"/>
<img src="/static/fix_logo_and_text.svg" width="400" class="mb-3" alt="Fix Inventory"/>
<form action="/authenticate" method="post" enctype="multipart/form-data">
<h1 class="h3 mb-3 fw-normal">Sign In</h1>
<h1 class="h3 mb-3 fw-normal">Log In</h1>
{% if error %}
<div class="alert alert-danger fade show">
{{ error }}
Expand All @@ -25,7 +25,7 @@ <h1 class="h3 mb-3 fw-normal">Sign In</h1>
<label for="password">Password</label>
</div>
<input name="redirect" type="hidden" value="{{ redirect }}">
<button class="w-100 btn btn-lg btn-primary" type="submit">Sign in</button>
<button class="w-100 btn btn-lg btn-primary" type="submit">Log in</button>
</form>
</div>
</main>
Expand Down
Loading