Skip to content
Open
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
41 changes: 41 additions & 0 deletions .github/workflows/docker-image.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
name: Docker Image CI

on:
push:
branches: [ "main" ]
paths:
- "Dockerfile"
- "requirements.txt"
- ".github/workflows/**"

permissions:
contents: read
packages: write

#jobs:

# build:

# runs-on: ubuntu-latest

# steps:
# - uses: actions/checkout@v4
# - name: Build the Docker image
# run: docker build . --file Dockerfile --tag my-image-name:$(date +%s)
jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Log in to GitHub Container Registry
uses: docker/login-action@v2
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Build Docker image
run: docker build . --file Dockerfile --tag ghcr.io/supersharkboiii/epstudio:latest

- name: Push Docker image
run: docker push ghcr.io/supersharkboiii/epstudio:latest
5 changes: 3 additions & 2 deletions app.py
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,8 @@ def auth_response():
if "error" in result:
print("error")
flash("Authentication error: " + result["error"], "error")
return render_template("auth_error.html", result=result)
#return render_template("auth_error.html", result=result)
return result, 400

user_info = auth.get_user()
print(user_info)
Expand Down Expand Up @@ -375,4 +376,4 @@ def delete_creation(creation_id):
db.session.commit()

flash("Creation deleted", "success")
return redirect(url_for("user_profile", user_id=current_user.id))
return redirect(url_for("user_profile", user_id=current_user.id))
1 change: 1 addition & 0 deletions app_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

# AUTHORITY = "https://login.microsoftonline.com/common" # For multi-tenant app
AUTHORITY = f"https://login.microsoftonline.com/{os.getenv('TENANT_ID', 'common')}"
# AUTHORITY = f"https://login.microsoftonline.com/{os.getenv('TENANT_ID')}"

REDIRECT_PATH = "/callback" # Used for forming an absolute URL to your redirect URI.
# The absolute URL must match the redirect URI you set
Expand Down
3 changes: 3 additions & 0 deletions templates/base.html
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@
<a href="{{ url_for('gallery') }}" class="brand">
<i class="fa-solid fa-film"></i> <!-- Gallery icon -->
</a>
<a href="https://forms.office.com/Pages/ResponsePage.aspx?id=ix5osiDdz0axYzcaLXxgFLaDAZj1t9tGopHx4EEumw1UNktXN0o0NVFaUlIxOTU5SDdUUlVDT1M5TC4u" target="_blank" class="brand">
<i class="fa-solid fa-bug"></i> <!-- Bug Report icon -->
</a>
</div>

<!-- Search Form -->
Expand Down