Skip to content

Commit

Permalink
Merge pull request #240 from Actualiza-Tu-Carro/216-userdashboard
Browse files Browse the repository at this point in the history
Delete unsave and non-existent imports, and change to Spanish
  • Loading branch information
JohanMejia77 authored Nov 29, 2023
2 parents cca59ae + 3279afc commit 00e1a15
Show file tree
Hide file tree
Showing 9 changed files with 57 additions and 205 deletions.
20 changes: 0 additions & 20 deletions src/app/dashboardUser/Maps/page.tsx

This file was deleted.

10 changes: 3 additions & 7 deletions src/app/dashboardUser/Settings/page.tsx
Original file line number Diff line number Diff line change
@@ -1,22 +1,18 @@
"use client"
'use client'
import React from 'react';
import '~/assets/styles/tailwind.css';

// components

import CardSettings from "~/components/componetsDashboard/Cards/CardSettings" ;
import CardProfile from "~/components/componetsDashboard/Cards/CardProfile";
import CardSettings from '~/components/componetsDashboard/Cards/CardSettings' ;

export default function Settings() {
return (
<>
<div className="flex flex-wrap">
<div className="w-full lg:w-8/12 px-4">
<div className="w-full px-4">
<CardSettings />
</div>
<div className="w-full lg:w-4/12 px-4">
<CardProfile />
</div>
</div>
</>
);
Expand Down
20 changes: 0 additions & 20 deletions src/app/dashboardUser/Tables/page.tsx

This file was deleted.

11 changes: 3 additions & 8 deletions src/app/dashboardUser/layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,7 @@ import '~/assets/styles/tailwind.css';

// components

import AdminNavbar from '~/components/componetsDashboard/Navbars/AdminNavbar.js';
import Sidebar from '~/components/componetsDashboard//Sidebar/Sidebar.js';
import HeaderStats from '~/components/componetsDashboard//Headers/HeaderStats.js';
import FooterAdmin from '~/components/componetsDashboard//Footers/FooterAdmin.js';

// views
Expand All @@ -24,12 +22,9 @@ export default function Admin({ children }: AdminProps) {
return (
<>
<Sidebar />
<div className="relative md:ml-64 bg-blueGray-100">
<AdminNavbar />
{/* Header */}
<HeaderStats />
<div className="px-4 md:px-10 mx-auto w-full -m-24">
{children}
<div className="md:ml-64 bg-blueGray-100 min-h-screen">
<div className="min-h-screen p-4 md:p-10 mx-auto w-full flex flex-col justify-around">
{children}
{/* <Switch>
<Route path="/admin/dashboard" exact component={Dashboard} />
<Route path="/admin/maps" exact component={Maps} />
Expand Down
14 changes: 4 additions & 10 deletions src/app/dashboardUser/page.tsx
Original file line number Diff line number Diff line change
@@ -1,30 +1,24 @@
import React from 'react';
import '~/assets/styles/tailwind.css';

// components

import CardLineChart from "~/components/componetsDashboard/Cards/CardLineChart"
import CardBarChart from '~/components/componetsDashboard/Cards/CardBarChart';
import CardPageVisits from '~/components/componetsDashboard/Cards/CardPageVisits';
import CardSocialTraffic from '~/components/componetsDashboard/Cards/CardSocialTraffic';

export default function Dashboard() {
return (
<>
<div className="flex flex-wrap">
<div className="w-full xl:w-8/12 mb-12 xl:mb-0 px-4">
<CardLineChart />

</div>
<div className="w-full xl:w-4/12 px-4">
<CardBarChart />

</div>
</div>
<div className="flex flex-wrap mt-4">
<div className="w-full xl:w-8/12 mb-12 xl:mb-0 px-4">
<CardPageVisits />

</div>
<div className="w-full xl:w-4/12 px-4">
<CardSocialTraffic />

</div>
</div>
</>
Expand Down
64 changes: 21 additions & 43 deletions src/components/componetsDashboard/Cards/CardSettings.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,22 +5,22 @@ import React from "react";
export default function CardSettings() {
return (
<>
<div className="relative flex flex-col min-w-0 break-words w-full mb-6 shadow-lg rounded-lg bg-blueGray-100 border-0">
<div className="relative flex flex-col min-w-0 break-words w-full mb-6 shadow-lg rounded-lg bg-blueGray-100">
<div className="rounded-t bg-white mb-0 px-6 py-6">
<div className="text-center flex justify-between">
<h6 className="text-blueGray-700 text-xl font-bold">My account</h6>
<h6 className="text-blueGray-700 text-xl font-bold">Mi cuenta</h6>
<button
className="bg-lightBlue-500 text-white active:bg-lightBlue-600 font-bold uppercase text-xs px-4 py-2 rounded shadow hover:shadow-md outline-none focus:outline-none mr-1 ease-linear transition-all duration-150"
type="button"
>
Settings
GUARDAR
</button>
</div>
</div>
<div className="flex-auto px-4 lg:px-10 py-10 pt-0">
<form>
<h6 className="text-blueGray-400 text-sm mt-3 mb-6 font-bold uppercase">
User Information
Información de usuario
</h6>
<div className="flex flex-wrap">
<div className="w-full lg:w-6/12 px-4">
Expand All @@ -29,12 +29,12 @@ export default function CardSettings() {
className="block uppercase text-blueGray-600 text-xs font-bold mb-2"
htmlFor="grid-password"
>
Username
Nombre de usuario
</label>
<input
type="text"
className="border-0 px-3 py-3 placeholder-blueGray-300 text-blueGray-600 bg-white rounded text-sm shadow focus:outline-none focus:ring w-full ease-linear transition-all duration-150"
defaultValue="lucky.jesse"
placeholder="lucky.jesse"
/>
</div>
</div>
Expand All @@ -44,12 +44,12 @@ export default function CardSettings() {
className="block uppercase text-blueGray-600 text-xs font-bold mb-2"
htmlFor="grid-password"
>
Email address
Correo electrónico
</label>
<input
type="email"
className="border-0 px-3 py-3 placeholder-blueGray-300 text-blueGray-600 bg-white rounded text-sm shadow focus:outline-none focus:ring w-full ease-linear transition-all duration-150"
defaultValue="[email protected]"
placeholder="[email protected]"
/>
</div>
</div>
Expand All @@ -59,12 +59,12 @@ export default function CardSettings() {
className="block uppercase text-blueGray-600 text-xs font-bold mb-2"
htmlFor="grid-password"
>
First Name
Nombre
</label>
<input
type="text"
className="border-0 px-3 py-3 placeholder-blueGray-300 text-blueGray-600 bg-white rounded text-sm shadow focus:outline-none focus:ring w-full ease-linear transition-all duration-150"
defaultValue="Lucky"
placeholder="Lucky"
/>
</div>
</div>
Expand All @@ -74,12 +74,12 @@ export default function CardSettings() {
className="block uppercase text-blueGray-600 text-xs font-bold mb-2"
htmlFor="grid-password"
>
Last Name
Apellido
</label>
<input
type="text"
className="border-0 px-3 py-3 placeholder-blueGray-300 text-blueGray-600 bg-white rounded text-sm shadow focus:outline-none focus:ring w-full ease-linear transition-all duration-150"
defaultValue="Jesse"
placeholder="Jesse"
/>
</div>
</div>
Expand All @@ -88,7 +88,7 @@ export default function CardSettings() {
<hr className="mt-6 border-b-1 border-blueGray-300" />

<h6 className="text-blueGray-400 text-sm mt-3 mb-6 font-bold uppercase">
Contact Information
Información de contacto
</h6>
<div className="flex flex-wrap">
<div className="w-full lg:w-12/12 px-4">
Expand All @@ -97,12 +97,12 @@ export default function CardSettings() {
className="block uppercase text-blueGray-600 text-xs font-bold mb-2"
htmlFor="grid-password"
>
Address
Dirección
</label>
<input
type="text"
className="border-0 px-3 py-3 placeholder-blueGray-300 text-blueGray-600 bg-white rounded text-sm shadow focus:outline-none focus:ring w-full ease-linear transition-all duration-150"
defaultValue="Bld Mihail Kogalniceanu, nr. 8 Bl 1, Sc 1, Ap 09"
placeholder="Bld Mihail Kogalniceanu, nr. 8 Bl 1, Sc 1, Ap 09"
/>
</div>
</div>
Expand All @@ -112,12 +112,12 @@ export default function CardSettings() {
className="block uppercase text-blueGray-600 text-xs font-bold mb-2"
htmlFor="grid-password"
>
City
Ciudad
</label>
<input
type="email"
className="border-0 px-3 py-3 placeholder-blueGray-300 text-blueGray-600 bg-white rounded text-sm shadow focus:outline-none focus:ring w-full ease-linear transition-all duration-150"
defaultValue="New York"
placeholder="New York"
/>
</div>
</div>
Expand All @@ -127,12 +127,12 @@ export default function CardSettings() {
className="block uppercase text-blueGray-600 text-xs font-bold mb-2"
htmlFor="grid-password"
>
Country
País
</label>
<input
type="text"
className="border-0 px-3 py-3 placeholder-blueGray-300 text-blueGray-600 bg-white rounded text-sm shadow focus:outline-none focus:ring w-full ease-linear transition-all duration-150"
defaultValue="United States"
placeholder="United States"
/>
</div>
</div>
Expand All @@ -142,40 +142,18 @@ export default function CardSettings() {
className="block uppercase text-blueGray-600 text-xs font-bold mb-2"
htmlFor="grid-password"
>
Postal Code
Código postal
</label>
<input
type="text"
className="border-0 px-3 py-3 placeholder-blueGray-300 text-blueGray-600 bg-white rounded text-sm shadow focus:outline-none focus:ring w-full ease-linear transition-all duration-150"
defaultValue="Postal Code"
placeholder="Postal Code"
/>
</div>
</div>
</div>

<hr className="mt-6 border-b-1 border-blueGray-300" />

<h6 className="text-blueGray-400 text-sm mt-3 mb-6 font-bold uppercase">
About Me
</h6>
<div className="flex flex-wrap">
<div className="w-full lg:w-12/12 px-4">
<div className="relative w-full mb-3">
<label
className="block uppercase text-blueGray-600 text-xs font-bold mb-2"
htmlFor="grid-password"
>
About me
</label>
<textarea
type="text"
className="border-0 px-3 py-3 placeholder-blueGray-300 text-blueGray-600 bg-white rounded text-sm shadow focus:outline-none focus:ring w-full ease-linear transition-all duration-150"
defaultValue="A beautiful UI Kit and Admin for React & Tailwind CSS. It is Free and Open Source."
rows="4"
></textarea>
</div>
</div>
</div>
</form>
</div>
</div>
Expand Down
70 changes: 0 additions & 70 deletions src/components/componetsDashboard/Headers/HeaderStats.js

This file was deleted.

2 changes: 1 addition & 1 deletion src/components/componetsDashboard/Navbars/AdminNavbar.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ export default function Navbar() {
return (
<>
{/* Navbar */}
<nav className="absolute top-0 left-0 w-full z-10 bg-transparent md:flex-row md:flex-nowrap md:justify-start flex items-center p-4">
<nav className="absolute top-0 left-0 w-full z-10 bg-transparent md:flex-row md:flex-nowrap md:justify-start flex items-center p-4 border border-primary-lm">
<div className="w-full mx-autp items-center flex justify-between md:flex-nowrap flex-wrap md:px-10 px-4">
{/* Brand */}
<a
Expand Down
Loading

0 comments on commit 00e1a15

Please sign in to comment.