summaryrefslogtreecommitdiff
path: root/src/web
diff options
context:
space:
mode:
Diffstat (limited to 'src/web')
-rw-r--r--src/web/_views/apps/settings/main.php48
-rw-r--r--src/web/_views/modal/about.php7
-rw-r--r--src/web/lang/Makefile19
-rwxr-xr-xsrc/web/lang/_bin/transpile.sh30
-rw-r--r--src/web/lang/en_US/api_lang.php1
-rw-r--r--src/web/lang/en_US/apps/settings.php6
-rw-r--r--src/web/lang/en_US/common_lang.php2
7 files changed, 58 insertions, 55 deletions
diff --git a/src/web/_views/apps/settings/main.php b/src/web/_views/apps/settings/main.php
index 0cdc4f2..00c1601 100644
--- a/src/web/_views/apps/settings/main.php
+++ b/src/web/_views/apps/settings/main.php
@@ -54,6 +54,23 @@ function handleSubmit(e) {
}
+function handlePassword(e) {
+ e.preventDefault();
+ let el = e.target.elements;
+ let curr = el.curr_password.value;
+ let newp = el.new_password.value;
+
+ $.ajax({
+ url: '/api/rpc/update_password',
+ method: 'POST',
+ data: JSON.stringify({
+ new_password: newp,
+ current_password: curr
+ }),
+ success: onSuccess
+ })
+}
+
const toBase64 = file => new Promise((resolve, reject) => {
const reader = new FileReader();
reader.readAsDataURL(file);
@@ -111,6 +128,37 @@ function resetMedia(media_type) {
<?=__create_form($user, 'last_name')?>
<?=__create_form($user, 'gender')?>
<hr class="mt">
+ <h2><?=ucfirst(lang('security_title'))?></h2>
+ <strong><?=ucfirst(lang('security_desc'))?></strong>
+ <form action="" class="col mt settings-form" onsubmit="handlePassword(event)">
+ <div class="rel mb" style="flex: 1">
+ <input
+ type="password"
+ name="curr_password"
+ id="curr_password"
+ placeholder=" "
+ >
+ <label for="curr_password">
+ <?=ucwords(lang('ph_current_pass'))?>
+ </label>
+ </div>
+ <div class="rel mb" style="flex: 1">
+ <input
+ type="password"
+ name="new_password"
+ id="new_password"
+ placeholder=" "
+ >
+ <label for="new_password">
+ <?=ucwords(lang('ph_new_pass'))?>
+ </label>
+ </div>
+ <button
+ class="btn btn-wide btn-submit"
+ style="flex: 0; height: fit-content;"
+ ><?=lang('update')?></button>
+ </form>
+ <hr class="mt">
<h2><?=ucfirst(lang('media_title'))?></h2>
<strong><?=ucfirst(lang('media_desc'))?></strong>
<h3><?=ucfirst(lang('ph_avatar'))?></h3>
diff --git a/src/web/_views/modal/about.php b/src/web/_views/modal/about.php
index 746607e..d434908 100644
--- a/src/web/_views/modal/about.php
+++ b/src/web/_views/modal/about.php
@@ -2,11 +2,10 @@
<?php /* vi: syntax=php */ ?>
<div id="about-modal-body">
<span class="logo">xssbook</span>
- <hr>
<span class="mb"><?=ucfirst(lang('version'))?></span>
<span><?=ucfirst(lang('copyright'))?></span>
- <hr>
- <a class="btn btn-blue" href="https://g.freya.cat/freya/xssbook2">Source Code</a>
+ <a class="btn btn-blue mt" href="https://g.freya.cat/freya/xssbook2">Source Code</a>
+ <p>For reports of abuse, please email <a class="btn-blue" href="mailto:contact@freyacat.org">contact@freyacat.org</a></p>
</div>
<style>
#about-modal-body {
@@ -15,8 +14,6 @@
flex-direction: column;
justify-content: center;
align-items: center;
- font-weight: bold;
- font-size: 1.1rem;
padding: 1rem;
}
#about-modal-body .logo {
diff --git a/src/web/lang/Makefile b/src/web/lang/Makefile
deleted file mode 100644
index fd4ca9c..0000000
--- a/src/web/lang/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# en_CAT generator from en_US
-# uwuify and awk required
-#
-
-LANG_SRC = $(shell find en_US -type f)
-LANG_OBJ = $(patsubst en_US/%,en_CAT/%,$(LANG_SRC))
-
-.PHONY: all
-
-all: $(LANG_OBJ)
-
-$(LANG_OBJ): en_CAT/% : en_US/%
- @printf "\033[35m UWU \033[0m%s\n" $<
- @mkdir -p $(@D)
- @./_bin/transpile.sh $< $@
-
-clean:
- @rm -fr "en_CAT"
diff --git a/src/web/lang/_bin/transpile.sh b/src/web/lang/_bin/transpile.sh
deleted file mode 100755
index 36cd226..0000000
--- a/src/web/lang/_bin/transpile.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/usr/bin/env bash
-
-lang_part() {
- echo "$1" | awk "{split(\$0,a,\" = \"); print a[$2]}"
-}
-export -f lang_part
-
-handle_line() {
- line="$1"
- left=$(lang_part "$line" 1)
- right=$(lang_part "$line" 2)
- echo "$left" | grep -Ev '_content|_line' > /dev/null
- code=$?
- if [ $code -eq 0 ]; then
- right=$(echo "$right" | uwuify)
- fi;
- right=${right%;};
- echo "$left = $right;"
-}
-export -f handle_line
-
-transpile() {
- file="$1"
- out="$2"
- printf "" > "$out"
- printf "<?php /* Copyright (c) 2024 Freya Murphy */\n\n" > "$out";
- grep "\$lang" < "$file" | xargs -n1 -I{} bash -c 'handle_line "$@"' _ {} >> "$out"
-}
-
-transpile "$1" "$2"
diff --git a/src/web/lang/en_US/api_lang.php b/src/web/lang/en_US/api_lang.php
index 3afc4f6..bc118dd 100644
--- a/src/web/lang/en_US/api_lang.php
+++ b/src/web/lang/en_US/api_lang.php
@@ -24,6 +24,7 @@ $lang['api_unique_value'] = '%s is not available (not unique)';
$lang['api_min_value'] = '%s length cannot be less than %s';
$lang['api_max_value'] = '%s length cannot exceed %s';
$lang['api_invalid_login'] = 'Invalid username or password';
+$lang['api_invalid_password'] = 'Invalid password';
$lang['api_unknown'] = 'An unknown error as occurred';
// toast messages
diff --git a/src/web/lang/en_US/apps/settings.php b/src/web/lang/en_US/apps/settings.php
index 2fca197..06796df 100644
--- a/src/web/lang/en_US/apps/settings.php
+++ b/src/web/lang/en_US/apps/settings.php
@@ -7,11 +7,17 @@ $lang['settings_success'] = 'Updated successfully';
$lang['general_title'] = 'Account Information';
$lang['general_desc'] = 'Modify your general account information.';
+$lang['security_title'] = 'Account Security';
+$lang['security_desc'] = 'Modify your account authentication information.';
+
$lang['media_title'] = 'Account Media';
$lang['media_desc'] = 'Modify your profiles avatar and banner.';
$lang['ph_avatar'] = 'Avatar';
$lang['ph_banner'] = 'Banner';
+$lang['ph_current_pass'] = 'Current Password';
+$lang['ph_new_pass'] = 'New Passowrd';
+
$lang['update'] = 'Update';
$lang['reset'] = 'Reset';
diff --git a/src/web/lang/en_US/common_lang.php b/src/web/lang/en_US/common_lang.php
index 771b20f..1d6a3e1 100644
--- a/src/web/lang/en_US/common_lang.php
+++ b/src/web/lang/en_US/common_lang.php
@@ -1,6 +1,6 @@
<?php /* Copyright (c) 2024 Freya Murphy */
-$lang['version'] = 'Version 2.0.3';
+$lang['version'] = 'Version 2.0.4';
$lang['copyright'] = 'Freya Murphy © 2024';
// Navigation Bar Lang