Skip to content

Commit

Permalink
fix update
Browse files Browse the repository at this point in the history
  • Loading branch information
@Lorezz
Lorezz committed Sep 19, 2024
1 parent 8013268 commit 22398e0
Show file tree
Hide file tree
Showing 13 changed files with 416 additions and 154 deletions.
1 change: 0 additions & 1 deletion .env
View file

This file was deleted.

3 changes: 1 addition & 2 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,4 @@ dist-ssr
*.sw?
.vercel

# Local Netlify folder
.netlify
.env
1 change: 1 addition & 0 deletions publiccode-editor-vite
Submodule publiccode-editor-vite added at a531dd
11 changes: 9 additions & 2 deletions src/components/ChartSave.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ function ChartSave({ item, handleSave }: any) {
const {
register,
handleSubmit,
formState: { errors },
formState: { errors, isDirty, isSubmitting, touchedFields, submitCount },
} = useForm({
defaultValues: {
id: item?.id || "",
Expand Down Expand Up @@ -92,7 +92,14 @@ function ChartSave({ item, handleSave }: any) {
</label>
</div>
</div>
<button type="submit" className="btn btn-primary full my-3">
{isSubmitting && (
<div className="loading loading-lg">...sumbitting</div>
)}
<button
disabled={isSubmitting}
type="submit"
className="btn btn-primary full my-3"
>
Save
</button>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/components/auth/SignIn.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ function SignIn({ setLogin }: { setLogin: (login: boolean) => void }) {
const rememberMe = submittedData["remember-me"] ?? false;
const result = await api.login({ email, password, rememberMe });
if (result) {
navigate("/");
navigate("/home");
} else {
setMessage("Error while logging in");
}
Expand Down
2 changes: 1 addition & 1 deletion src/components/auth/SignUp.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ function SignUp({ setLogin }: { setLogin: (login: boolean) => void }) {
try {
const result = await api.register({ email, password });
if (result) {
navigate("/login");
navigate("/home");
} else {
setMessage("Error while registering");
}
Expand Down
19 changes: 9 additions & 10 deletions src/components/layout/Footer.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,17 @@ export default function Footer() {
<p>Dataviz: share your charts</p>
</aside>
<nav>
<h6 className="footer-title">Services</h6>
<a className="link link-hover">Branding</a>
<a className="link link-hover">Design</a>
<a className="link link-hover">Marketing</a>
<a className="link link-hover">Advertisement</a>
<h6 className="footer-title">Tools</h6>
<a className="link link-hover">Generate Data</a>
<a className="link link-hover">Match Geo-Json Data</a>
<a className="link link-hover">Trasform raw data</a>
<a className="link link-hover">Use open source data</a>
</nav>
<nav>
<h6 className="footer-title">Company</h6>
<a className="link link-hover">About us</a>
<a className="link link-hover">Contact</a>
<a className="link link-hover">Jobs</a>
<a className="link link-hover">Press kit</a>
<h6 className="footer-title">Take part</h6>
<a className="link link-hover">Project Design</a>
<a className="link link-hover">Code</a>
<a className="link link-hover">Community</a>
</nav>
<nav>
<h6 className="footer-title">Legal</h6>
Expand Down
113 changes: 77 additions & 36 deletions src/components/layout/Header.tsx
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import React, { useEffect, useState } from "react";
import * as auth from "../../lib/auth";

export default function Header() {
Expand All @@ -12,9 +11,34 @@ export default function Header() {

function logoutAndRedir() {
auth.logout();
// window.location.href = "/enter";
window.location.href = "/";
}

const menu = [
{
name: "Home",
link: "/",
},
{
name: "Create Chart",
link: "/home",
},
{
name: "Manage Data",
link: "",
subMenu: [
{
name: "Generate",
link: "/generate-data",
},
{
name: "Load Remote",
link: "/load-data",
},
],
},
];

return (
<div className="navbar bg-primary text-primary-content shadow-xl mb-2">
<div className="navbar-start">
Expand All @@ -39,23 +63,30 @@ export default function Header() {
tabIndex={0}
className="menu menu-sm dropdown-content bg-base-100 text-primary rounded-box z-[1] mt-3 w-52 p-2 shadow"
>
<li>
<a href="/">Create Chart</a>
</li>
<li>
<a>Data</a>
<ul className="p-2">
<li>
<a href="/generate-data">Generate</a>
</li>
<li>
<a href="/load-data">Load Remote</a>
</li>
</ul>
</li>
<li>
<a href="/about">About</a>
</li>
{menu.map((item, index) => {
if (item.subMenu) {
return (
<li>
<a>{item.name}</a>
<ul className="p-2">
{item.subMenu.map((subItem, subIndex) => {
return (
<li key={subIndex}>
<a href={subItem.link}>{subItem.name}</a>
</li>
);
})}
</ul>
</li>
);
} else {
return (
<li key={index}>
<a href={item.link}>{item.name}</a>
</li>
);
}
})}
</ul>
</div>
<a className="btn btn-ghost text-xl" href="/">
Expand All @@ -64,25 +95,35 @@ export default function Header() {
</div>
<div className="navbar-center hidden lg:flex">
<ul className="menu menu-horizontal px-1 bg-base text-content">
<li>
<a href="/">Create Chart</a>
</li>
<li>
<a href="/about">About</a>
</li>
<li>
<details className="">
<summary>Data</summary>
<ul className="w-[125px] bg-base-100 text-primary">
<li className="bg-base-100 text-primary">
<a href="/generate-data">Generate</a>
{menu.map((item, index) => {
if (item.subMenu) {
return (
<li>
<details>
<summary>{item.name}</summary>
<ul className="w-[125px] bg-base-100 text-primary z-10">
{item.subMenu.map((subItem, subIndex) => {
return (
<li
key={subIndex}
className="bg-base-100 text-primary"
>
<a href={subItem.link}>{subItem.name}</a>
</li>
);
})}
</ul>
</details>
</li>
<li className="bg-base-100 text-primary">
<a href="/load-data">Load Remote</a>
);
} else {
return (
<li key={index}>
<a href={item.link}>{item.name}</a>
</li>
</ul>
</details>
</li>
);
}
})}
</ul>
</div>
<div className="navbar-end px-4">
Expand Down
25 changes: 23 additions & 2 deletions src/lib/api.ts
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import * as auth from "./auth";
const SERVER_URL = import.meta.env.VITE_SERVER_URL;

/** Upsert */
export async function upsertChart(
item: {
name: string;
Expand All @@ -19,7 +20,7 @@ export async function upsertChart(
const payload = JSON.stringify(item);
const method = id ? "PUT" : "POST";

console.log("upsertChart", url, method);
console.log("UPSERT-CHART", url, method);

const response = await fetch(url, {
method,
Expand All @@ -29,7 +30,7 @@ export async function upsertChart(
},
body: payload,
});
console.log("upsertChart", response.status);
console.log("UPSERT-CHART", response.status);

if (response.status === 401) {
return auth.logout();
Expand All @@ -39,9 +40,11 @@ export async function upsertChart(
const data = await response.json();
return data;
}

return null;
}

/** Delete */
export async function deleteChart(id: string) {
const token = auth.getAuth();
if (!token) return null;
Expand All @@ -64,6 +67,7 @@ export async function deleteChart(id: string) {
return null;
}

/** List */
export async function getCharts() {
const token = auth.getAuth();
if (!token) return null;
Expand All @@ -87,6 +91,7 @@ export async function getCharts() {
}
}

/** Login */
export async function login({
email,
password,
Expand Down Expand Up @@ -116,6 +121,7 @@ export async function login({
}
}

/** Register */
export async function register({
email,
password,
Expand All @@ -141,3 +147,18 @@ export async function register({
}
}
}

export async function showChart(id: string) {
const response = await fetch(`${SERVER_URL}/charts/show/${id}`, {
method: "GET",
headers: {
"Content-Type": "application/json",
},
});
if (response.status === 200) {
const data = await response.json();
return data;
} else {
return [];
}
}
17 changes: 9 additions & 8 deletions src/main.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,16 @@ function App() {
const router = createBrowserRouter([
{
path: "/",
element: <AboutPage />,
},
{
path: "/home",
element: <HomePage />,
},
{
path: "/enter",
element: <AuthPage />,
},
{
path: "/load-data",
element: <LoadDataPage />,
Expand All @@ -26,18 +34,11 @@ function App() {
path: "/generate-data",
element: <GenerateDataPage />,
},
{
path: "/about",
element: <AboutPage />,
},

{
path: "/chart/:id",
element: <ShowChartPage />,
},
{
path: "/enter",
element: <AuthPage />,
},
]);

return (
Expand Down
Loading

0 comments on commit 22398e0

Please sign in to comment.