Skip to content

Commit

Permalink
Merge pull request #84 from Thorfusion/dev
Browse files Browse the repository at this point in the history
Update to 1.5.0
  • Loading branch information
maggi373 authored Sep 6, 2024
2 parents 759a304 + a734495 commit d9d8ea1
Show file tree
Hide file tree
Showing 39 changed files with 1,013 additions and 394 deletions.
38 changes: 0 additions & 38 deletions .github/ISSUE_TEMPLATE/bug_report.md

This file was deleted.

86 changes: 86 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
name: Bug Report for solder.py
description: File a bug report for solder.py
title: "[BUG]: "
labels: ["TYPE: BUG", "STATUS: NOT STARTED", "PRIORITY: N/A"]
body:
- type: textarea
id: Describe-the-bug
attributes:
label: Describe the bug
placeholder: A clear and concise description of what the bug is.
validations:
required: true
- type: textarea
id: To-Reproduce
attributes:
label: To Reproduce
description: Steps to reproduce the behavior
placeholder:
value: "1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
4. See error"
validations:
required: true
- type: textarea
id: Expected-behavior
attributes:
label: Expected behavior
placeholder: A clear and concise description of what you expected to happen.
validations:
required: true
- type: input
id: solderversion
attributes:
label: solder.py Version
description: What version of solder.py are you running?
validations:
required: true
- type: dropdown
id: os
attributes:
label: What OS/Container are you seeing the problem on?
multiple: true
options:
- Official Docker
- Windows
- Linux
- MAC
- BSD
- Docker
- LVC
validations:
required: false
- type: markdown
attributes:
value: "We only guarantee support trough our official docker container"
- type: textarea
id: Screenshots
attributes:
label: Screenshots
description:
placeholder: "Add screenshots to help explain your problem here. If you don't, we may not help you."
- type: textarea
id: Enviroment Variables
attributes:
label: Provide censored enviroment variables here
description:
placeholder: Paste variables here
render: shell
validations:
required: true
- type: textarea
id: logs
attributes:
label: Snippet of the issue in Logs from your docker container
description:
placeholder: Paste log here
render: shell
validations:
required: true
- type: markdown
attributes:
value: "## Issues not providing the required files will not get help"
46 changes: 46 additions & 0 deletions .github/ISSUE_TEMPLATE/enhancement.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
name: Enhancement request solder.py
description: File a enhancement request solder.py
title: "[ENHANCEMENT]: "
labels: ["TYPE: ENHANCEMENT", "STATUS: NOT STARTED", "PRIORITY: N/A"]
body:
- type: textarea
id: prob
attributes:
label: Is your enhancement request related to a problem? Please describe.
placeholder: A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
validations:
required: true
- type: textarea
id: sol
attributes:
label: Describe the solution you'd like
placeholder: A clear and concise description of what you want to happen.
validations:
required: true
- type: textarea
id: alt
attributes:
label: Describe alternatives you've considered
placeholder: A clear and concise description of any alternative solutions or features you've considered.
validations:
required: false
- type: input
id: solderversion
attributes:
label: solder.py Version
description: What version of solder.py are you running?
validations:
required: true
- type: textarea
id: Screenshots
attributes:
label: Screenshots
description:
placeholder: "Add screenshots to help explain."
- type: textarea
id: cont
attributes:
label: Additional context
placeholder: Add any other context or screenshots about the feature request here.
validations:
required: false
20 changes: 0 additions & 20 deletions .github/ISSUE_TEMPLATE/feature_request.md

This file was deleted.

39 changes: 17 additions & 22 deletions Pipfile.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ solder.py is even compatible with original solder's database, visit the install
+ Maven integration
+ Modrinth integration
+ MCIL export support
+ Advanced user management

## Unfinished Features in dev

Expand Down Expand Up @@ -129,6 +128,7 @@ docker run --name solderpy --restart always -d -p 80:5000 thorfusion/solderpy
#### Repo variables

This is the public facing URL for your repository. This is prefix url that technic launcher uses to download the mods. Include a trailing slash!
You dont actually need to store the files in mods but solder.py own hosting folder is mods. S3 public links can be root for an example, same with repo url aswell.

```bash
-e SOLDER_MIRROR_URL=https://solder.example.com/mods/
Expand Down
13 changes: 6 additions & 7 deletions alogin.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from flask import Blueprint, redirect, render_template, request, session, url_for
from flask import Blueprint, flash, redirect, render_template, request, session, url_for

from models.session import Session
from models.user import User
Expand All @@ -18,19 +18,18 @@ def login_page():
def login():
if "key" in session and Session.verify_session(session["token"], request.remote_addr):
# Already logged in
print("already logged in")
return redirect(url_for('asite.index'))

user = User.get_by_username(request.form["username"])
if user is None:
print("login failed")
return render_template("login.html", failed=True)
flash("Login Failed!", "error")
return render_template("login.html")
else:
if user.verify_password(request.form["password"]):
# if new_user:
# return render_template("login.html", failed=True)
session["token"] = Session.new_session(request.remote_addr)
print("login success")
session["token"] = Session.new_session(request.remote_addr, User.get_userid(request.form["username"]))
return redirect(url_for('asite.index'))
else:
return render_template("login.html", failed=True)
flash("Login Failed!", "error")
return render_template("login.html")
Loading

0 comments on commit d9d8ea1

Please sign in to comment.