GitHub/trunk-server
1
0
Fork 0
mirror of https://github.com/openmhz/trunk-server.git synced 2026-11-14 17:58:02 -05:00
Code Issues Packages Projects Releases Wiki Activity

fixed admin

Browse Source
This commit is contained in:
Luke Berndt
2024-09-07 09:53:26 -04:00
parent f9bff813d2
commit 1be715c042
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
account/src/User/Login.js
View File

@@ -42,8 +42,9 @@ const Login = (props) => {
const loginSubmit = async (event) => { const loginSubmit = async (event) => {
event.preventDefault(); event.preventDefault();
const result = await dispatch(loginUser({ email, password })).unwrap(); const result = await dispatch(loginUser({ email, password })).unwrap();
const user = result.user;
if (result.success) { if (result.success) {
if ((pathname != "/terms") && (terms != 1.1)) { if ((pathname != "/terms") && (user.terms != 1.1)) {
navigate("/terms") navigate("/terms")
} else if (nextLocation) { } else if (nextLocation) {
switch (nextLocation) { switch (nextLocation) {

2
backend/controllers/uploads.js
View File

@@ -29,7 +29,7 @@ const client = new S3Client({
credentials: fromIni({ profile: s3_profile }), credentials: fromIni({ profile: s3_profile }),
endpoint: s3_endpoint, endpoint: s3_endpoint,
region: s3_region, region: s3_region,
maxAttempts: 1, maxAttempts: 2,
}); });
exports.upload = async function (req, res, next) { exports.upload = async function (req, res, next) {