Created envars and updated config flow

This commit is contained in:
Dunemask 2021-08-14 17:56:29 -06:00
parent 0e424ec5fa
commit d4b5a555b9
12 changed files with 56 additions and 62 deletions

View file

@ -1,16 +1,13 @@
//Module Imports
// Module Imports
import React from "react";
import { toast } from "react-toastify";
//Local Imports
// Local Imports
import Stashbar from "./Stashbar";
import StashUpload from "./StashUpload";
import StashContextMenu from "./StashContextMenu";
import { serverUrls } from "./api.json";
import { api } from "../config.json";
import "./scss/Stash.scss";
//Constants
const filesUrl = `${serverUrls.GET.filesUrl}`;
//Class
// Constants
const buildFilebox = (file, index) => ({
file,
selected: false,
@ -37,7 +34,7 @@ class StashBoard extends React.Component {
componentDidMount() {
window.cairoApi
.get(filesUrl)
.get(api.nubian.urls.files)
.then((res) => {
if (res.data === undefined || res.data.length === undefined)
return toast.error("Error Loading Files");

View file

@ -11,11 +11,11 @@ import {
} from "@fortawesome/free-solid-svg-icons";
//Local Imports
import "./scss/stash/StashContextMenu.scss";
import { serverUrls } from "./api.json";
import { api } from "../config.json";
//Constants
const downloadUrl = `${serverUrls.POST.downloadUrl}`;
const deleteUrl = `${serverUrls.POST.deleteUrl}`;
const publicUrl = `${serverUrls.POST.publicUrl}`;
const downloadUrl = api.nubian.urls.download;
const deleteUrl = api.nubian.urls.delete;
const publicUrl = api.nubian.urls.public;
export default class StashContextMenu extends React.Component {
infoView() {

View file

@ -1,7 +1,6 @@
import React from "react";
import Dropzone from "react-dropzone";
import FileDisplay from "./FileDisplay";
import "./scss/stash/StashDropzone.scss";
class StashDropzone extends React.Component {
render() {

View file

@ -1,14 +1,14 @@
//Module Imports
// Module Imports
import React from "react";
import { CancelToken } from "axios";
import { toast } from "react-toastify";
//Local Imports
// Local Imports
import StashDropzone from "./StashDropzone";
import StashUploadDialog from "./uploader/StashUploadDialog";
//Constants
import { serverUrls, serverFields } from "./api.json";
const uploadUrl = `${serverUrls.POST.uploadUrl}`;
const uploadField = serverFields.uploadField;
// Constants
import { api } from "../config.json";
const uploadUrl = api.nubian.urls.upload;
const uploadField = api.nubian.misc.uploadField;
const cancelMessage = "User Canceled";
const successClearTime = 200;

View file

@ -1,22 +0,0 @@
{
"serverUrls": {
"POST": {
"uploadUrl": "/api/nubian/stash/upload",
"downloadUrl": "/api/nubian/stash/download",
"deleteUrl": "/api/nubian/stash/delete",
"publicUrl": "/api/nubian/stash/public"
},
"GET": {
"filesUrl": "/api/nubian/stash/files",
"rawUrl": "/api/nubian/stash/raw"
},
"api": {
"cairo": {
"verify": "/api/cairo/user/data"
}
}
},
"serverFields": {
"uploadField": "user-selected-file"
}
}