diff --git a/frontend/src/views/Login.vue b/frontend/src/views/Login.vue
index db14aae..edc5caf 100644
--- a/frontend/src/views/Login.vue
+++ b/frontend/src/views/Login.vue
@@ -7,6 +7,8 @@ const username = ref('');
const password = ref('');
const router = useRouter();
const toast = useToast();
+const url = new URL(window.location.href);
+const api = (url.port == "5173") ? "http://localhost:3001" : "/api";
async function onLoginClick() {
var login =
@@ -15,7 +17,7 @@ async function onLoginClick() {
password: password.value
};
try {
- const response = await axios.post(`http://localhost:3001/login`, login);
+ const response = await axios.post(api + `/login`, login);
if (response.status === 200) {
localStorage.setItem('token', response.data.token);
router.push('/home');
diff --git a/frontend/src/views/OsCrud.vue b/frontend/src/views/OsCrud.vue
index 3184d82..31b13c7 100644
--- a/frontend/src/views/OsCrud.vue
+++ b/frontend/src/views/OsCrud.vue
@@ -19,10 +19,12 @@ const submitted = ref(false);
const checkAuth = () => {
auth.checkToken(true);
};
+const url = new URL(window.location.href);
+const api = (url.port == "5173") ? "http://localhost:3001" : "/api";
async function showTable() {
try {
- const response = await axios.get(`http://localhost:3001/os`);
+ const response = await axios.get(api + `/os`);
console.log(response.data);
users.value = response.data;
}
@@ -41,7 +43,7 @@ async function onCreateClick() {
name: os.value.name
};
try {
- const response = await axios.post(`http://localhost:3001/os`, newOS, auth.getTokenHeader());
+ const response = await axios.post(api + `/os`, newOS, auth.getTokenHeader());
if (response.status === 204) {
toast.add({ severity: 'success', summary: 'Successful', detail: 'OS Created', life: 3000 });
@@ -94,7 +96,7 @@ async function onChangeOS() {
};
console.log(os.value.ID);
try {
- const response = await axios.patch(`http://localhost:3001/os/` + os.value.ID, changeOS, auth.getTokenHeader());
+ const response = await axios.patch(api + `/os/` + os.value.ID, changeOS, auth.getTokenHeader());
if (response.status === 204) {
toast.add({ severity: 'success', summary: 'Successful', detail: 'OS Modified', life: 3000 });
@@ -117,7 +119,7 @@ const confirmDeleteUser = (editUser) => {
async function deleteUser() {
try {
- const response = await axios.delete(`http://localhost:3001/os/` + os.value.ID, auth.getTokenHeader());
+ const response = await axios.delete(api + `/os/` + os.value.ID, auth.getTokenHeader());
if (response.status !== 204) {
console.error(response);
}
@@ -139,7 +141,7 @@ const confirmDeleteSelected = () => {
const deleteSelectedUsers = () => {
selectedUsers.value.forEach(element => {
try {
- const response = axios.delete(`http://localhost:3001/os/` + element.ID, auth.getTokenHeader());
+ const response = axios.delete(api + `/os/` + element.ID, auth.getTokenHeader());
if (response.status !== 204) {
console.error(response);
}
@@ -173,8 +175,8 @@ const initFilters = () => {
-
+
@@ -185,8 +187,7 @@ const initFilters = () => {
:rows="10" :filters="filters"
paginatorTemplate="FirstPageLink PrevPageLink PageLinks NextPageLink LastPageLink CurrentPageReport RowsPerPageDropdown"
:rowsPerPageOptions="[5, 10, 25]"
- currentPageReportTemplate="Showing {first} to {last} of {totalRecords} users"
- responsiveLayout="scroll">
+ currentPageReportTemplate="Showing {first} to {last} of {totalRecords} users" responsiveLayout="scroll">
Manage Users
@@ -258,8 +259,7 @@ const initFilters = () => {
Are you sure you want to delete the selected users?
-
+
diff --git a/frontend/src/views/UserCrud.vue b/frontend/src/views/UserCrud.vue
index e68864e..4e39cca 100644
--- a/frontend/src/views/UserCrud.vue
+++ b/frontend/src/views/UserCrud.vue
@@ -19,10 +19,12 @@ const userDialogChange = ref(false);
const checkAuth = () => {
auth.checkToken(true);
};
+const url = new URL(window.location.href);
+const api = (url.port == "5173") ? "http://localhost:3001" : "/api";
async function showTable() {
try {
- const response = await axios.get(`http://localhost:3001/user`, auth.getTokenHeader());
+ const response = await axios.get(api + `/user`, auth.getTokenHeader());
users.value = response.data;
}
catch (error) {
@@ -48,7 +50,7 @@ async function onCreateClick() {
email: user.value.email
};
try {
- const response = await axios.post(`http://localhost:3001/user`, newUser, auth.getTokenHeader());
+ const response = await axios.post(api + `/user`, newUser, auth.getTokenHeader());
if (response.status === 204) {
toast.add({ severity: 'success', summary: 'Successful', detail: 'User Created', life: 3000 });
@@ -104,7 +106,7 @@ async function onChangeUser() {
email: user.value.email
};
try {
- const response = await axios.patch(`http://localhost:3001/user/` + user.value.ID, changeUser, auth.getTokenHeader());
+ const response = await axios.patch(api + `/user/` + user.value.ID, changeUser, auth.getTokenHeader());
if (response.status === 204) {
toast.add({ severity: 'success', summary: 'Successful', detail: 'User Modified', life: 3000 });
@@ -127,7 +129,7 @@ const confirmDeleteUser = (editUser) => {
async function deleteUser() {
try {
- const response = await axios.delete(`http://localhost:3001/user/` + user.value.ID, auth.getTokenHeader());
+ const response = await axios.delete(api + `/user/` + user.value.ID, auth.getTokenHeader());
if (response.status !== 204) {
console.error(response);
}
@@ -149,7 +151,7 @@ const confirmDeleteSelected = () => {
const deleteSelectedUsers = () => {
selectedUsers.value.forEach(element => {
try {
- const response = axios.delete(`http://localhost:3001/user/` + element.ID, auth.getTokenHeader());
+ const response = axios.delete(api + `/user/` + element.ID, auth.getTokenHeader());
if (response.status !== 204) {
console.error(response);
}