Proyecto-Titulo/alai-server
3
0
Fork 0
Code Issues Pull Requests Releases Activity

Compare commits

base: Proyecto-Titulo:master
Branches Tags
Proyecto-Titulo:master
Proyecto-Titulo:HEAD
..
compare: Proyecto-Titulo:HEAD
Branches Tags
Proyecto-Titulo:master
Proyecto-Titulo:HEAD

No commits in common. "master" and "HEAD" have entirely different histories.
master ... HEAD

9 changed files with 29 additions and 32 deletions
Show Stats Expand all files Collapse all files

BIN
frontend/src/assets/images/alai.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 9.8 KiB

BIN
frontend/src/assets/images/obelisk.jpg
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 54 KiB

4
frontend/src/layout/AppTopbar.vue
View File

@ -7,8 +7,6 @@ import axios from 'axios';
import jwt_decode from 'jwt-decode';
import auth from '../utils/Auth';
const url = new URL(window.location.href);
const api = (url.port == "5173") ? "http://localhost:3001" : "/api/v1";
const { onMenuToggle } = useLayout();
const outsideClickListener = ref(null);
const topbarMenuActive = ref(false);
@ -71,7 +69,7 @@ async function savePassword(pass) {
var token = localStorage.getItem("token");
var decoded = jwt_decode(token);
try {
const response = await axios.patch(api + `/user/` + decoded.id, pass, auth.getTokenHeader());
const response = await axios.patch(`http://localhost:3001/user/` + decoded.id, pass, auth.getTokenHeader());
if (response.status !== 204) {
console.error(response);
}

2
frontend/src/utils/Auth.js
View File

@ -13,7 +13,7 @@ var auth = {
},
checkToken(redirect = true, callback = null) {
const url = new URL(window.location.href);
const api = (url.port == "5173") ? "http://localhost:3001" : "/api/v1";
const api = (url.port == "5173") ? "http://localhost:3001" : "/api";
const config = this.getTokenHeader();

7
frontend/src/views/Chart.vue
View File

@ -24,13 +24,10 @@ const setColorOptions = () => {
textColorSecondary = documentStyle.getPropertyValue('--text-color-secondary');
surfaceBorder = documentStyle.getPropertyValue('--surface-border');
};
const url = new URL(window.location.href);
const api = (url.port == "5173") ? "http://localhost:3001" : "/api/v1";
async function getGames() {
try {
const response = await axios.get(api + `/game?limit=5000`);
const response = await axios.get(`http://localhost:3001/game?limit=5000`);
games.value = response.data.map(game_id => {
return game_id.ID;
});
@ -45,7 +42,7 @@ async function getFrames() {
if (selectedGame.value === undefined) {
return;
}
const response = await axios.get(api + `/frame?limit=5000&game_id=` + selectedGame.value);
const response = await axios.get(`http://localhost:3001/frame?limit=5000&game_id=` + selectedGame.value);
if (response.data[response.data.length - 1].elapsed_time >= 10000) {
ms.value = false;
}

10
frontend/src/views/Landing.vue
View File

@ -41,6 +41,12 @@ const onClickLinux = () => {
<span>Features</span>
</a>
</li>
<li>
<a @click="smoothScroll('#moreinfo')"
class="flex m-0 md:ml-5 px-0 py-3 text-900 font-medium line-height-3 p-ripple" v-ripple>
<span>More info</span>
</a>
</li>
<li>
<a @click="smoothScroll('#downloads')"
class="flex m-0 md:ml-5 px-0 py-3 text-900 font-medium line-height-3 p-ripple" v-ripple>
@ -82,7 +88,7 @@ const onClickLinux = () => {
<div class="grid mt-8 pb-2 md:pb-8">
<div class="flex justify-content-center col-12 lg:col-6 p-0 flex-order-1 lg:flex-order-0"
style="border-radius: 8px">
<img src="@/assets/images/alai.png" class="w-11" alt="alai screenshot" />
<img src="public/images/alai.png" class="w-11" alt="alai screenshot" />
</div>
<div class="col-12 lg:col-6 my-auto flex flex-column lg:align-items-end text-center lg:text-right">
@ -112,7 +118,7 @@ const onClickLinux = () => {
<div class="flex align-items-center justify-content-end flex-order-1 sm:flex-order-2 col-12 lg:col-6 p-0"
style="border-radius: 8px">
<img src="@/assets/images/obelisk.jpg" class="flex w-11" alt="obelisk" width="100" height="100" />
<img src="public/images/obelisk.jpg" class="flex w-11" alt="obelisk" width="100" height="100" />
</div>
</div>
</div>

4
frontend/src/views/Login.vue
View File

@ -7,8 +7,6 @@ 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/v1";
async function onLoginClick() {
var login =
@ -17,7 +15,7 @@ async function onLoginClick() {
password: password.value
};
try {
const response = await axios.post(api + `/login`, login);
const response = await axios.post(`http://localhost:3001/login`, login);
if (response.status === 200) {
localStorage.setItem('token', response.data.token);
router.push('/home');

22
frontend/src/views/OsCrud.vue
View File

@ -19,12 +19,10 @@ 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/v1";
async function showTable() {
try {
const response = await axios.get(api + `/os`);
const response = await axios.get(`http://localhost:3001/os`);
console.log(response.data);
users.value = response.data;
}
@ -43,7 +41,7 @@ async function onCreateClick() {
name: os.value.name
};
try {
const response = await axios.post(api + `/os`, newOS, auth.getTokenHeader());
const response = await axios.post(`http://localhost:3001/os`, newOS, auth.getTokenHeader());
if (response.status === 204) {
toast.add({ severity: 'success', summary: 'Successful', detail: 'OS Created', life: 3000 });
@ -96,7 +94,7 @@ async function onChangeOS() {
};
console.log(os.value.ID);
try {
const response = await axios.patch(api + `/os/` + os.value.ID, changeOS, auth.getTokenHeader());
const response = await axios.patch(`http://localhost:3001/os/` + os.value.ID, changeOS, auth.getTokenHeader());
if (response.status === 204) {
toast.add({ severity: 'success', summary: 'Successful', detail: 'OS Modified', life: 3000 });
@ -119,7 +117,7 @@ const confirmDeleteUser = (editUser) => {
async function deleteUser() {
try {
const response = await axios.delete(api + `/os/` + os.value.ID, auth.getTokenHeader());
const response = await axios.delete(`http://localhost:3001/os/` + os.value.ID, auth.getTokenHeader());
if (response.status !== 204) {
console.error(response);
}
@ -141,7 +139,7 @@ const confirmDeleteSelected = () => {
const deleteSelectedUsers = () => {
selectedUsers.value.forEach(element => {
try {
const response = axios.delete(api + `/os/` + element.ID, auth.getTokenHeader());
const response = axios.delete(`http://localhost:3001/os/` + element.ID, auth.getTokenHeader());
if (response.status !== 204) {
console.error(response);
}
@ -175,8 +173,8 @@ const initFilters = () => {
<template v-slot:start>
<div class="my-2">
<Button label="New" icon="pi pi-plus" class="p-button-success mr-2" @click="openNew" />
<Button label="Delete" icon="pi pi-trash" class="p-button-danger" @click="confirmDeleteSelected"
:disabled="!selectedUsers || !selectedUsers.length" />
<Button label="Delete" icon="pi pi-trash" class="p-button-danger"
@click="confirmDeleteSelected" :disabled="!selectedUsers || !selectedUsers.length" />
</div>
</template>
@ -187,7 +185,8 @@ 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">
<template #header>
<div class="flex flex-column md:flex-row md:justify-content-between md:align-items-center">
<h5 class="m-0">Manage Users</h5>
@ -259,7 +258,8 @@ const initFilters = () => {
<span v-if="os">Are you sure you want to delete the selected users?</span>
</div>
<template #footer>
<Button label="No" icon="pi pi-times" class="p-button-text" @click="deleteUsersDialog = false" />
<Button label="No" icon="pi pi-times" class="p-button-text"
@click="deleteUsersDialog = false" />
<Button label="Yes" icon="pi pi-check" class="p-button-text" @click="deleteSelectedUsers" />
</template>
</Dialog>

12
frontend/src/views/UserCrud.vue
View File

@ -19,12 +19,10 @@ 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/v1";
async function showTable() {
try {
const response = await axios.get(api + `/user`, auth.getTokenHeader());
const response = await axios.get(`http://localhost:3001/user`, auth.getTokenHeader());
users.value = response.data;
}
catch (error) {
@ -50,7 +48,7 @@ async function onCreateClick() {
email: user.value.email
};
try {
const response = await axios.post(api + `/user`, newUser, auth.getTokenHeader());
const response = await axios.post(`http://localhost:3001/user`, newUser, auth.getTokenHeader());
if (response.status === 204) {
toast.add({ severity: 'success', summary: 'Successful', detail: 'User Created', life: 3000 });
@ -106,7 +104,7 @@ async function onChangeUser() {
email: user.value.email
};
try {
const response = await axios.patch(api + `/user/` + user.value.ID, changeUser, auth.getTokenHeader());
const response = await axios.patch(`http://localhost:3001/user/` + user.value.ID, changeUser, auth.getTokenHeader());
if (response.status === 204) {
toast.add({ severity: 'success', summary: 'Successful', detail: 'User Modified', life: 3000 });
@ -129,7 +127,7 @@ const confirmDeleteUser = (editUser) => {
async function deleteUser() {
try {
const response = await axios.delete(api + `/user/` + user.value.ID, auth.getTokenHeader());
const response = await axios.delete(`http://localhost:3001/user/` + user.value.ID, auth.getTokenHeader());
if (response.status !== 204) {
console.error(response);
}
@ -151,7 +149,7 @@ const confirmDeleteSelected = () => {
const deleteSelectedUsers = () => {
selectedUsers.value.forEach(element => {
try {
const response = axios.delete(api + `/user/` + element.ID, auth.getTokenHeader());
const response = axios.delete(`http://localhost:3001/user/` + element.ID, auth.getTokenHeader());
if (response.status !== 204) {
console.error(response);
}