appfactorystudio/portal_v3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update 3983453

Browse Source
This commit is contained in:
equippedcoding-master
2025-09-30 10:25:02 -05:00
parent 5ced0e3a4b
commit 7191e6ea8b
10 changed files with 287 additions and 200 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
portal/admin/.htaccess
View File

@@ -7,7 +7,7 @@
# RewriteCond %{REQUEST_FILENAME} !-d
# RewriteRule . /portal/admin/index.php [L]
</IfModule>
Options -Indexes

30
portal/admin/core/api/js/appfactory/afsdocuments.js
View File

@@ -8,7 +8,7 @@
} else {
root.AFSDocuments = factory();// browser global.
}
})(function() {
})(function() {
function AFSDocuments(documents, app, managed_domain){
this.files = documents;
@@ -31,8 +31,11 @@
let gen_nam = "d"+self.app.utils.randomGenerator(12) + "." + file.name.split('.').pop();
let content_type = self.getMimiType(file.name);
// let urlparams = `/portal/admin/core/api/php/request.php?getdoc=true&ref=${ref_num}&name=${gen_nam}&content_type=${content_type}`;
let urlparams = `/portal/api/data/downloads?getdoc=true&ref=${ref_num}&name=${gen_nam}&content_type=${content_type}`;
let doc_url = self.app.extra.config.managed_domain.Address + urlparams;
let urlparams = `?getdoc=true&ref=${ref_num}&name=${gen_nam}&content_type=${content_type}`;
let doc_url = `https://api.${self.app.extra.config.managed_domain.Domain}/v1/data/downloads${urlparams}`;
let doc_url2 = `${self.app.extra.config.managed_domain.Address2}/portal/admin/core/api/php/request.php${urlparams}`;
// https://www.appfactory.studio/portal/api/data/downloads?getdoc=true&ref=doc888072803282&name=djnUwMIfNWmiK.png&content_type=image/png
// https://api.appfactory.studio/v1/data/downloads?getdoc=true&ref=doc888072803282&name=djnUwMIfNWmiK.png&content_type=image/png
let fileobj = self._NewFileObject(
file.name,
@@ -40,15 +43,16 @@
file.size,
file.type,
new Date().toLocaleString(),
"/mnt/"+self.app.extra.config.managed_domain.SystemUser+"/modules/documents",
"/mnt/node1/"+self.app.extra.config.managed_domain.SystemUser+"/modules/documents",
doc_url,
doc_url2,
ref_num,
catogery,
jsondata);
// console.log(fileobj);
let formData = new FormData();
formData.append("fileuploadUrl", file);
formData.append("fileuploadUrl", file);
formData.append("datauploadUrl", JSON.stringify(fileobj));
let req = new XMLHttpRequest();
@@ -81,6 +85,8 @@
req.open("POST", requesturl);
req.send(formData);
});
},
@@ -88,7 +94,7 @@
},
_NewFileObject: function(on,gn,fs,ft,ud,loc,url,ref,cat,jsondata){
_NewFileObject: function(on,gn,fs,ft,ud,loc,url,url2,ref,cat,jsondata){
return {
"original_name": on,
"generated_name": gn,
@@ -97,6 +103,7 @@
"upload_date": ud,
"directory": loc,
"url": url,
"url2": url2,
"reference_num": ref,
"catagory": cat,
"json": jsondata
@@ -220,6 +227,17 @@
},
getDocumentUrl(document,managed_domain){
let url = document.url;
if(window.location.href.includes(managed_domain.Domain)){
url = document.url;
}else{
url = document.url2;
}
return url;
}

160
portal/admin/core/api/js/pages/modules/imp_documents.js
View File

@@ -13,6 +13,7 @@
})(function(bootstrap) {
function init(app){
app.extra.current.documents = {};
AFSSpinner.showFullScreen(true);
@@ -20,6 +21,7 @@
app.extra.extras.RequestDocuments(100,function(documents){
if(app.extra.documents==undefined){ app.extra.documents = documents; }
app.extra.instances.documents.setDocuments(documents);
AFSSpinner.showFullScreen(false);
_init(app);
},app.extra.documents,true,app);
@@ -32,7 +34,8 @@
function append_files(documents,app){
let ids = [];
let rowsHtml = "";
for (let i = 0; i < documents.length; i++) {
// for (let i = 0; i < documents.length; i++) {
for (let i = documents.length - 1; i >= 0; i--) {
const index = i;
const document = documents[i];
const id = "m"+app.utils.randomGenerator(12);
@@ -70,7 +73,7 @@
console.log(params);
AFSSpinner.showFullScreen(false);
modal.toggle();
let documents = app.extra.documents;
let documents = app.extra.instances.documents.files; // app.extra.documents;
append_files(documents,app);
});
});
@@ -122,14 +125,15 @@
});
});
});
function displayImageEditor(app){
// Image editor
let url = app.extra.instances.documents.getDocumentUrl(app.extra.current.documents.document.obj, app.extra.config.managed_domain);
var imageEditor = new tui.ImageEditor('#tui-image-editor-container2', {
includeUI: {
loadImage: {
path: app.extra.current.documents.document.obj.url, //'img/sampleImage2.png',
path: url, //'img/sampleImage2.png',
name: 'SampleImage',
},
// theme: blackTheme, // or whiteTheme
@@ -150,7 +154,7 @@
}
// console.log(app.extra.current.documents);
if(app.utils.imageExists(app.extra.current.documents.document.obj.url)){
if(app.utils.isFileType("image",app.extra.current.documents.document.obj.generated_name)){
// console.log(imageExists(app.extra.current.documents.document.obj.url));
@@ -163,12 +167,6 @@
$("#document_status_message").text("File missing!");
}
console.log(app.extra.current.documents.document);
// console.log(imageEditor);
// console.log(tui);
}
function UpdateDocuments(action,mydocument,app,cb){
@@ -210,7 +208,7 @@
<th class="w-1"></th>
</tr>
</thead>
<tbody>
<tbody id="documents_table_body">
${rows}
</tbody>
@@ -264,99 +262,6 @@
$("#_______add_document_btn12121").on("click",function(e){
e.preventDefault();
let modal = new bootstrap.Modal("#modal_upload_document");
modal.toggle();
$("#modal_upload_new_file_btn").off();
$("#modal_upload_new_file_btn").on("click",function(e){
e.preventDefault();
AFSSpinner.showFullScreen(true);
let file = $('#modal_document_file_upload_input').prop('files')[0];
let fileobj = NewFileObject(
file.name,
"d"+app.utils.randomGenerator(12) + "." + file.name.split('.').pop(),
file.size,
file.type,
new Date().toLocaleString(),
"/mnt/"+app.extra.config.managed_domain.SystemUser+"/modules/documents",
"none");
console.log(file);
console.log(fileobj);
app.extra.config.configurations.documents[0].json.files.push(fileobj);
UploadDocument(file, fileobj, app, function(resp){
console.log(resp);
let senddata2 = {
configurations_update: true,
mysql_id: app.extra.config.configurations.documents[0].json.mysql_id,
data: JSON.stringify(app.extra.config.configurations.documents[0].json)
}
$.post(app.extra.url,senddata2,function(resp2){
AFSSpinner.showFullScreen(false);
console.log(resp2);
RemoveModal(modal);
append_files(app);
});
});
//
// var form_data = new FormData();
// form_data.append('file', file_data);
// console.log(file_data);
// let fi = document.getElementById('modal_document_file_upload_input');
// const fsize = fi.files.item(0).size;
// const file = Math.round((fsize / 1024));
// // The size of the file.
// if (file >= 4096) {
// console.log("yes");
// }else{
// console.log("no");
// }
// $.ajax({
// url: app.extra.url + "?upload=true", // <-- point to server-side PHP script
// dataType: 'text', // <-- what to expect back from the PHP script, if anything
// cache: false,
// contentType: false,
// processData: false,
// data: form_data,
// type: 'post',
// success: function(php_script_response){
// alert(php_script_response); // <-- display response from the PHP script, if any
// }
// });
// RemoveModal(modal);
// let senddata = {
// configurations_update:true,
// mysql_id: app.extra.config.configurations.documents[0].mysql_id,
// data: JSON.stringify(app.extra.config.configurations.documents[0])
// }
// $.post(app.extra.url,senddata,function(resp){
// console.log(resp);
// });
})
});
}
@@ -391,53 +296,10 @@
$('body').css("overflow","");
$('body').css("padding-right","");
}
function NewFileObject(on,gn,fs,ft,ud,loc,url){
return {
"original_name": on,
"generated_name": gn,
"file_size": fs,
"file_type": ft,
"upload_date": ud,
"location": loc,
"url": url
}
}
// deprecated - used in afsdocuments
function UploadDocument(file,obj,app,cb){
let formData = new FormData();
// these values are switched
let datauploadUrl = "datauploadUrl";//sponsorship.json.request.dataupload;
let fileuploadUrl = "fileuploadUrl";//sponsorship.json.request.fileupload;
formData.append(fileuploadUrl, file);
formData.append(datauploadUrl, JSON.stringify(obj));
let req = new XMLHttpRequest();
req.addEventListener('progress', function(e) {
var done = e.position || e.loaded, total = e.totalSize || e.total;
// console.log('---progress: ' + (Math.floor(done/total*1000)/10) + '%');
}, false);
if ( req.upload ) {
// self.upload_in_progress = true;
req.upload.onprogress = function(e) {
var done = e.position || e.loaded, total = e.totalSize || e.total;
// console.log(' req.upload progress: ' + done + ' / ' + total + ' = ' + (Math.floor(done/total*1000)/10) + '%');
};
}
req.onreadystatechange = function(e) {
if ( 4 == this.readyState ) {
// console.log(e.target.responseText)
if(cb!=undefined){
cb(e.target.responseText,e);
}
}
};
let requesturl = app.extra.url;// afsconfig.managed_domain.Address + "/" + sponsorship.json.request.url
req.open("POST", requesturl);
req.send(formData);
}
return {
init,

15
portal/admin/core/api/php/includes/functions.php
View File

@@ -679,6 +679,10 @@ function getSubdomain2($dboverride = false) {
}
$subdomain = str_replace("\n", "", $subdomain);
$subdomain = trim($subdomain, " ");
if($subdomain!="www" || $subdomain!="www15"){
$subdomain = "www";
}
return $subdomain;
}
function get_subdomain_managed_domain_new_way($subdomain,$dboverride = false){
@@ -8341,6 +8345,8 @@ function admin_documents_delete_document(){
}
// rrrrr
function api_data_downloads(){
// if (Input::get('getdoc')) {
$subdomain = getSubdomain2();
@@ -8357,6 +8363,8 @@ function api_data_downloads(){
$content_type = Input::get("content_type");
$content_type = ($content_type) ? $content_type : "image/$ext";
$filename = $fileDir . $file;
// https://api.appfactory.studio/v1/data/downloads?getdoc=true&ref=doc888072803282&name=djnUwMIfNWmiK.png&content_type=image/png
if (file_exists($filename))
{
header('Content-Description: File Transfer');
@@ -8374,7 +8382,9 @@ function api_data_downloads(){
die();
}else{
// echo $filename;
echo "";
// echo "no file $subdomain $filename ";
// EchoJsonObject($managed_domain);
}
// }
@@ -8448,7 +8458,8 @@ function handleUploadFile(){
"file_type" => $data2["file_type"],
"upload_date" => $data2["upload_date"],
"directory" => $data2["directory"],
"url" => $data2["url"]
"url" => $data2["url"],
"url2" => $data2["url2"]
));
// {
// "success" : 1,

2
portal/admin/core/api/php/request.php
View File

@@ -626,7 +626,7 @@ if(Input::get("admin_documents_get_documents")){
if(Input::get("admin_documents_delete_document")){
admin_documents_delete_document();
}
if (Input::get('datauploadUrl')) {
if (Input::get('datauploadUrl')) {
$handle = handleUploadFile();
echo json_encode($handle["message"]);
}

4
portal/admin/core/db/create-system-tables.sql
View File

@@ -128,10 +128,14 @@ CREATE TABLE IF NOT EXISTS documents (
upload_date VARCHAR(255) NULL,
directory VARCHAR(255) NULL,
url VARCHAR(255) NULL,
url2 VARCHAR(255) NULL,
jsontext MEDIUMTEXT,
date TIMESTAMP DEFAULT CURRENT_TIMESTAMP()
);
-- ALTER TABLE documents CREATE COLUMN url2 VARCHAR(255) NULL;
-- Forms
CREATE TABLE IF NOT EXISTS forms (
id INT AUTO_INCREMENT PRIMARY KEY,

52
portal/admin/core/scripts/remote/builder/app_install.sh
View File

@@ -272,18 +272,18 @@ function run_install()
chmod 775 -R /home/$systemuser/
mkdir -p /home/$systemuser/gitfolder/
if [ -d "${basedirectory}/www/.vscode" ]; then
mv ${basedirectory}/www/.vscode /home/$systemuser/gitfolder/
fi
if [ -f "${basedirectory}/www/.gitignore" ]; then
mv ${basedirectory}/www/.gitignore /home/$systemuser/gitfolder/
fi
if [ -d "${basedirectory}/www/.git" ]; then
mv ${basedirectory}/www/.git /home/$systemuser/gitfolder/
fi
if [ -f "${basedirectory}/www/README.md" ]; then
mv ${basedirectory}/www/README.md /home/$systemuser/gitfolder/
fi
# if [ -d "${basedirectory}/www/.vscode" ]; then
# mv ${basedirectory}/www/.vscode /home/$systemuser/gitfolder/
# fi
# if [ -f "${basedirectory}/www/.gitignore" ]; then
# mv ${basedirectory}/www/.gitignore /home/$systemuser/gitfolder/
# fi
# if [ -d "${basedirectory}/www/.git" ]; then
# mv ${basedirectory}/www/.git /home/$systemuser/gitfolder/
# fi
# if [ -f "${basedirectory}/www/README.md" ]; then
# mv ${basedirectory}/www/README.md /home/$systemuser/gitfolder/
# fi
# TODO_1: Should I be using type.txt
echo $subdomain > ${basedirectory}/www/portal/type.txt
@@ -353,34 +353,6 @@ function run_mysql_database()
basedirectory="/home/$systemuser/websites"
log2="/mnt/node1/appfactorystudio/logs/remote_logger2.log"
# sleep 5
# echo "" &>> $log2
# echo "===== mysql_password" &>> $log2
# echo "$mysql_password" &>> $log2
# echo "" &>> $log2
# echo "===== CONFIG_JSON" &>> $log2
# echo "$CONFIG_JSON" &>> $log2
# echo "" 2>&1 >> $log2
# echo "===== MAIN_DIR" &>> $log2
# echo "$MAIN_DIR" &>> $log2
# echo "" 2>&1 >> $log2
# echo "===== db_username" &>> $log2
# echo "$db_username" &>> $log2
# echo "" 2>&1 >> $log2
# echo "===== db_name" &>> $log2
# echo "$db_name" &>> $log2
# if [ -d "/home/${systemuser}/websites/www/portal/" ]; then
# echo "DOES EXIST NOW 1 - $systemuser" &>> $log2
# else
# echo "DOES NOT EXIST NOW 2 - $systemuser" &>> $log2
# fi
mysql -p"${mysql_password}" -u root -e "CREATE DATABASE IF NOT EXISTS ${db_name}"; 2>&1 >> $log2
mysql -p"${mysql_password}" -u root -e "CREATE USER '${db_username}'@'localhost' IDENTIFIED BY '${db_password}'"; 2>&1 >> $log2
mysql -p"${mysql_password}" -u root -e "GRANT ALL ON ${db_name}.* TO '${db_username}'@'localhost'"; 2>&1 >> $log2