Merge branch 'master' of git.keannu1.duckdns.org:keannu125/Borrowing-TrackerFrontend

This commit is contained in:
Keannu Bernasol 2023-12-14 14:53:09 +08:00
commit 96c8f9a150
3 changed files with 5 additions and 5 deletions

View file

@ -24,7 +24,7 @@ let backendURL;
if (debug) { if (debug) {
backendURL = "http://localhost:8000/"; backendURL = "http://localhost:8000/";
} else { } else {
backendURL = "https://equipment-tracker-backend.keannu1.duckdns.org/"; backendURL = "https://csm-backend.keannu1.duckdns.org/";
} }
const instance = axios.create({ const instance = axios.create({

View file

@ -1,6 +1,6 @@
import Button from "../../Components/Button/Button"; import Button from "../../Components/Button/Button";
import styles from "../../styles"; import styles from "../../styles";
import citc_logo from "../../assets/citc_logo.jpg"; import Logo_dako from "../../assets/Logo_dako.png"
import Popup from "reactjs-popup"; import Popup from "reactjs-popup";
import "reactjs-popup/dist/index.css"; import "reactjs-popup/dist/index.css";
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
@ -40,7 +40,7 @@ export default function LandingPage() {
}} }}
> >
<div style={{ height: "auto", flex: 1, flexWrap: "wrap" }}> <div style={{ height: "auto", flex: 1, flexWrap: "wrap" }}>
<img style={{ width: "16rem", height: "auto" }} src={citc_logo} /> <img style={{ width: "16rem", height: "auto" }} src={Logo_dako} />
</div> </div>
<div <div
style={{ style={{
@ -63,9 +63,9 @@ export default function LandingPage() {
}} }}
> >
<p style={{ ...styles.text_dark, ...styles.text_L }}> <p style={{ ...styles.text_dark, ...styles.text_L }}>
CITC EQUIPMENT CSM BORROWING
<br /> <br />
TRACKER SYSTEM
</p> </p>
<div style={{ ...styles.flex_column }}> <div style={{ ...styles.flex_column }}>
<Button <Button

BIN
src/assets/Logo_dako.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 22 KiB