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.

Sign up for GitHub

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

Jump to bottom

Offline resources #133

Merged
merged 3 commits into from
Jul 10, 2023
Merged

Offline resources #133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fdb1f71
update offline useability
BenediktMKuehne Jul 5, 2023
59f4ad5
rm safe on uninstall
BenediktMKuehne Jul 6, 2023
d76dbc1
typo
BenediktMKuehne Jul 6, 2023
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
10 changes: 8 additions & 2 deletions embark/templates/base.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,13 @@
<title>{% block title %}{% endblock title %}</title>

{# Load CSS and JavaScript #}
{% bootstrap_css %}
{% bootstrap_javascript %}
<!--offline/online stuff
{% bootstrap_css %}
{% bootstrap_javascript %}-->

<!--bootstrap-->
<link rel="stylesheet" href="{% static 'external/css/bootstrap.css' %}"/>
<script type="text/javascript" src="{% static 'external/scripts/bootstrap.js' %}"></script>

<!-- jQuery-confirm style sheet -->
<link rel="stylesheet" href="{% static 'external/css/confirm.css' %}"/>
Expand All @@ -43,6 +48,7 @@
<!-- local Javascript files-->
<script type="text/javascript" src="{% static 'scripts/main.js' %}"></script>
<script type="text/javascript" src="{% static 'scripts/alertBox.js' %}"></script>

{% block js %}{% endblock js %}

</head>
Expand Down
2 changes: 1 addition & 1 deletion helper/helper_embark_general.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ check_db() {
fi
sleep 5s
echo -e "$BLUE""$BOLD""2. checking password""$NC\\n"
if ! mysql --host="$HOST_ENV" --user="$USER_ENV" --password="$PW_ENV" -e"quit"; then # PW_ENV=$(grep DATABASE_PASSWORD ./.env | sed 's/DATABASE\_PASSWORD\=//')mysql -h 172.22.0.5 -u embark -p $PW_ENV -e "quit"
if ! mysql --host="$HOST_ENV" --user="$USER_ENV" --password="$PW_ENV" -e"quit" &>/dev/null; then
echo -e "$ORANGE""$BOLD""Failed logging into database with password""$NC"
echo -e "---------------------------------------------------------------------------"
echo -e "$CYAN""Old passwords are stored in the \"safe\" folder when uninstalling EMBArk""$NC\\n"
Expand Down
9 changes: 5 additions & 4 deletions installer.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,11 +329,11 @@ install_embark_default(){
mkdir -p ./embark/static/external/{scripts,css}
wget -O ./embark/static/external/scripts/jquery.js https://code.jquery.com/jquery-3.6.0.min.js
wget -O ./embark/static/external/scripts/confirm.js https://cdnjs.cloudflare.com/ajax/libs/jquery-confirm/3.3.2/jquery-confirm.min.js
wget -O ./embark/static/external/scripts/bootstrap.js https://cdn.jsdelivr.net/npm/bootstrap@5.1.1/dist/js/bootstrap.bundle.min.js
wget -O ./embark/static/external/scripts/bootstrap.js https://cdn.jsdelivr.net/npm/bootstrap@5.2.3/dist/js/bootstrap.bundle.min.js
wget -O ./embark/static/external/scripts/datatable.js https://cdn.datatables.net/v/bs5/dt-1.11.2/datatables.min.js
wget -O ./embark/static/external/scripts/charts.js https://cdn.jsdelivr.net/npm/chart.js@3.5.1/dist/chart.min.js
wget -O ./embark/static/external/css/confirm.css https://cdnjs.cloudflare.com/ajax/libs/jquery-confirm/3.3.2/jquery-confirm.min.css
wget -O ./embark/static/external/css/bootstrap.css https://cdn.jsdelivr.net/npm/bootstrap@5.1.1/dist/css/bootstrap.min.css
wget -O ./embark/static/external/css/bootstrap.css https://cdn.jsdelivr.net/npm/bootstrap@5.2.3/dist/css/bootstrap.min.css
wget -O ./embark/static/external/css/datatable.css https://cdn.datatables.net/v/bs5/dt-1.11.2/datatables.min.css
find ./embark/static/external/ -type f -exec sed -i '/sourceMappingURL/d' {} \;
fi
Expand Down Expand Up @@ -404,11 +404,11 @@ install_embark_dev(){
mkdir -p ./embark/static/external/{scripts,css}
wget -O ./embark/static/external/scripts/jquery.js https://code.jquery.com/jquery-3.6.0.min.js
wget -O ./embark/static/external/scripts/confirm.js https://cdnjs.cloudflare.com/ajax/libs/jquery-confirm/3.3.2/jquery-confirm.min.js
wget -O ./embark/static/external/scripts/bootstrap.js https://cdn.jsdelivr.net/npm/bootstrap@5.1.1/dist/js/bootstrap.bundle.min.js
wget -O ./embark/static/external/scripts/bootstrap.js https://cdn.jsdelivr.net/npm/bootstrap@5.2.3/dist/js/bootstrap.bundle.min.js
wget -O ./embark/static/external/scripts/datatable.js https://cdn.datatables.net/v/bs5/dt-1.11.2/datatables.min.js
wget -O ./embark/static/external/scripts/charts.js https://cdn.jsdelivr.net/npm/chart.js@3.5.1/dist/chart.min.js
wget -O ./embark/static/external/css/confirm.css https://cdnjs.cloudflare.com/ajax/libs/jquery-confirm/3.3.2/jquery-confirm.min.css
wget -O ./embark/static/external/css/bootstrap.css https://cdn.jsdelivr.net/npm/bootstrap@5.1.1/dist/css/bootstrap.min.css
wget -O ./embark/static/external/css/bootstrap.css https://cdn.jsdelivr.net/npm/bootstrap@5.2.3/dist/css/bootstrap.min.css
wget -O ./embark/static/external/css/datatable.css https://cdn.datatables.net/v/bs5/dt-1.11.2/datatables.min.css
find ./embark/static/external/ -type f -exec sed -i '/sourceMappingURL/d' {} \;
fi
Expand Down Expand Up @@ -525,6 +525,7 @@ uninstall (){
# final
if [[ "$REFORCE" -eq 0 ]]; then
sudo -u "${SUDO_USER:-${USER}}" git reset
rm -r ./safe/*
fi
echo -e "$ORANGE""$BOLD""Consider""$CYAN""\$git pull""$NC"
}
Expand Down
Loading