Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix Dependencies and a tags #34

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 8 additions & 32 deletions components/Dropdowns/IndexDropdown.js
Original file line number Diff line number Diff line change
Expand Up @@ -43,45 +43,33 @@ const IndexDropdown = () => {
>
Admin Layout
</span>
<Link href="/admin/dashboard">
<a
href="#pablo"
<Link href="/admin/dashboard"
className={
"text-sm py-2 px-4 font-normal block w-full whitespace-nowrap bg-transparent text-blueGray-700"
}
>
Dashboard
</a>
</Link>
<Link href="/admin/settings">
<a
href="#pablo"
<Link href="/admin/settings"
className={
"text-sm py-2 px-4 font-normal block w-full whitespace-nowrap bg-transparent text-blueGray-700"
}
>
Settings
</a>
</Link>
<Link href="/admin/tables">
<a
href="#pablo"
<Link href="/admin/tables"
className={
"text-sm py-2 px-4 font-normal block w-full whitespace-nowrap bg-transparent text-blueGray-700"
}
>
Tables
</a>
</Link>
<Link href="/admin/maps">
<a
href="#pablo"
<Link href="/admin/maps"
className={
"text-sm py-2 px-4 font-normal block w-full whitespace-nowrap bg-transparent text-blueGray-700"
}
>
Maps
</a>
</Link>
<div className="h-0 mx-4 my-2 border border-solid border-blueGray-100" />
<span
Expand All @@ -91,25 +79,19 @@ const IndexDropdown = () => {
>
Auth Layout
</span>
<Link href="/auth/login">
<a
href="#pablo"
<Link href="/auth/login"
className={
"text-sm py-2 px-4 font-normal block w-full whitespace-nowrap bg-transparent text-blueGray-700"
}
>
Login
</a>
</Link>
<Link href="/auth/register">
<a
href="#pablo"
<Link href="/auth/register"
className={
"text-sm py-2 px-4 font-normal block w-full whitespace-nowrap bg-transparent text-blueGray-700"
}
>
Register
</a>
</Link>
<div className="h-0 mx-4 my-2 border border-solid border-blueGray-100" />
<span
Expand All @@ -119,25 +101,19 @@ const IndexDropdown = () => {
>
No Layout
</span>
<Link href="/landing">
<a
href="#pablo"
<Link href="/landing"
className={
"text-sm py-2 px-4 font-normal block w-full whitespace-nowrap bg-transparent text-blueGray-700"
}
>
Landing
</a>
</Link>
<Link href="/profile">
<a
href="#pablo"
<Link href="/profile"
className={
"text-sm py-2 px-4 font-normal block w-full whitespace-nowrap bg-transparent text-blueGray-700"
}
>
Profile
</a>
</Link>
</div>
</>
Expand Down
40 changes: 8 additions & 32 deletions components/Dropdowns/PagesDropdown.js
Original file line number Diff line number Diff line change
Expand Up @@ -43,45 +43,33 @@ const PagesDropdown = () => {
>
Admin Layout
</span>
<Link href="/admin/dashboard">
<a
href="#pablo"
<Link href="/admin/dashboard"
className={
"text-sm py-2 px-4 font-normal block w-full whitespace-nowrap bg-transparent text-blueGray-700"
}
>
Dashboard
</a>
</Link>
<Link href="/admin/settings">
<a
href="#pablo"
<Link href="/admin/settings"
className={
"text-sm py-2 px-4 font-normal block w-full whitespace-nowrap bg-transparent text-blueGray-700"
}
>
Settings
</a>
</Link>
<Link href="/admin/tables">
<a
href="#pablo"
<Link href="/admin/tables"
className={
"text-sm py-2 px-4 font-normal block w-full whitespace-nowrap bg-transparent text-blueGray-700"
}
>
Tables
</a>
</Link>
<Link href="/admin/maps">
<a
href="#pablo"
<Link href="/admin/maps"
className={
"text-sm py-2 px-4 font-normal block w-full whitespace-nowrap bg-transparent text-blueGray-700"
}
>
Maps
</a>
</Link>
<div className="h-0 mx-4 my-2 border border-solid border-blueGray-100" />
<span
Expand All @@ -91,25 +79,19 @@ const PagesDropdown = () => {
>
Auth Layout
</span>
<Link href="/auth/login">
<a
href="#pablo"
<Link href="/auth/login"
className={
"text-sm py-2 px-4 font-normal block w-full whitespace-nowrap bg-transparent text-blueGray-700"
}
>
Login
</a>
</Link>
<Link href="/auth/register">
<a
href="#pablo"
<Link href="/auth/register"
className={
"text-sm py-2 px-4 font-normal block w-full whitespace-nowrap bg-transparent text-blueGray-700"
}
>
Register
</a>
</Link>
<div className="h-0 mx-4 my-2 border border-solid border-blueGray-100" />
<span
Expand All @@ -119,25 +101,19 @@ const PagesDropdown = () => {
>
No Layout
</span>
<Link href="/landing">
<a
href="#pablo"
<Link href="/landing"
className={
"text-sm py-2 px-4 font-normal block w-full whitespace-nowrap bg-transparent text-blueGray-700"
}
>
Landing
</a>
</Link>
<Link href="/profile">
<a
href="#pablo"
<Link href="/profile"
className={
"text-sm py-2 px-4 font-normal block w-full whitespace-nowrap bg-transparent text-blueGray-700"
}
>
Profile
</a>
</Link>
</div>
</>
Expand Down
5 changes: 1 addition & 4 deletions components/Navbars/AuthNavbar.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,10 @@ export default function Navbar(props) {
<nav className="top-0 absolute z-50 w-full flex flex-wrap items-center justify-between px-2 py-3 navbar-expand-lg">
<div className="container px-4 mx-auto flex flex-wrap items-center justify-between">
<div className="w-full relative flex justify-between lg:w-auto lg:static lg:block lg:justify-start">
<Link href="/">
<a
<Link href="/"
className="text-white text-sm font-bold leading-relaxed inline-block mr-4 py-2 whitespace-nowrap uppercase"
href="#pablo"
>
Notus NextJS
</a>
</Link>
<button
className="cursor-pointer text-xl leading-none px-3 py-1 border border-solid border-transparent rounded bg-transparent block lg:hidden outline-none focus:outline-none"
Expand Down
5 changes: 1 addition & 4 deletions components/Navbars/IndexNavbar.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,10 @@ export default function Navbar(props) {
<nav className="top-0 fixed z-50 w-full flex flex-wrap items-center justify-between px-2 py-3 navbar-expand-lg bg-white shadow">
<div className="container px-4 mx-auto flex flex-wrap items-center justify-between">
<div className="w-full relative flex justify-between lg:w-auto lg:static lg:block lg:justify-start">
<Link href="/">
<a
<Link href="/"
className="text-blueGray-700 text-sm font-bold leading-relaxed inline-block mr-4 py-2 whitespace-nowrap uppercase"
href="#pablo"
>
Notus NextJS
</a>
</Link>
<button
className="cursor-pointer text-xl leading-none px-3 py-1 border border-solid border-transparent rounded bg-transparent block lg:hidden outline-none focus:outline-none"
Expand Down
50 changes: 10 additions & 40 deletions components/Sidebar/Sidebar.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,10 @@ export default function Sidebar() {
<i className="fas fa-bars"></i>
</button>
{/* Brand */}
<Link href="/">
<a
href="#pablo"
<Link href="/"
className="md:block text-left md:pb-2 text-blueGray-600 mr-0 inline-block whitespace-nowrap text-sm uppercase font-bold p-4 px-0"
>
Notus NextJS
</a>
</Link>
{/* User */}
<ul className="md:hidden items-center flex flex-wrap list-none">
Expand All @@ -49,13 +46,10 @@ export default function Sidebar() {
<div className="md:min-w-full md:hidden block pb-4 mb-4 border-b border-solid border-blueGray-200">
<div className="flex flex-wrap">
<div className="w-6/12">
<Link href="/">
<a
href="#pablo"
<Link href="/"
className="md:block text-left md:pb-2 text-blueGray-600 mr-0 inline-block whitespace-nowrap text-sm uppercase font-bold p-4 px-0"
>
Notus NextJS
</a>
</Link>
</div>
<div className="w-6/12 flex justify-end">
Expand Down Expand Up @@ -90,9 +84,7 @@ export default function Sidebar() {

<ul className="md:flex-col md:min-w-full flex flex-col list-none">
<li className="items-center">
<Link href="/admin/dashboard">
<a
href="#pablo"
<Link href="/admin/dashboard"
className={
"text-xs uppercase py-3 font-bold block " +
(router.pathname.indexOf("/admin/dashboard") !== -1
Expand All @@ -109,14 +101,11 @@ export default function Sidebar() {
}
></i>{" "}
Dashboard
</a>
</Link>
</li>

<li className="items-center">
<Link href="/admin/settings">
<a
href="#pablo"
<Link href="/admin/settings"
className={
"text-xs uppercase py-3 font-bold block " +
(router.pathname.indexOf("/admin/settings") !== -1
Expand All @@ -133,14 +122,11 @@ export default function Sidebar() {
}
></i>{" "}
Settings
</a>
</Link>
</li>

<li className="items-center">
<Link href="/admin/tables">
<a
href="#pablo"
<Link href="/admin/tables"
className={
"text-xs uppercase py-3 font-bold block " +
(router.pathname.indexOf("/admin/tables") !== -1
Expand All @@ -157,14 +143,11 @@ export default function Sidebar() {
}
></i>{" "}
Tables
</a>
</Link>
</li>

<li className="items-center">
<Link href="/admin/maps">
<a
href="#pablo"
<Link href="/admin/maps"
className={
"text-xs uppercase py-3 font-bold block " +
(router.pathname.indexOf("/admin/maps") !== -1
Expand All @@ -181,7 +164,6 @@ export default function Sidebar() {
}
></i>{" "}
Maps
</a>
</Link>
</li>
</ul>
Expand All @@ -196,26 +178,20 @@ export default function Sidebar() {

<ul className="md:flex-col md:min-w-full flex flex-col list-none md:mb-4">
<li className="items-center">
<Link href="/auth/login">
<a
href="#pablo"
<Link href="/auth/login"
className="text-blueGray-700 hover:text-blueGray-500 text-xs uppercase py-3 font-bold block"
>
<i className="fas fa-fingerprint text-blueGray-400 mr-2 text-sm"></i>{" "}
Login
</a>
</Link>
</li>

<li className="items-center">
<Link href="/auth/register">
<a
href="#pablo"
<Link href="/auth/register"
className="text-blueGray-700 hover:text-blueGray-500 text-xs uppercase py-3 font-bold block"
>
<i className="fas fa-clipboard-list text-blueGray-300 mr-2 text-sm"></i>{" "}
Register
</a>
</Link>
</li>
</ul>
Expand All @@ -230,26 +206,20 @@ export default function Sidebar() {

<ul className="md:flex-col md:min-w-full flex flex-col list-none md:mb-4">
<li className="items-center">
<Link href="/landing">
<a
href="#pablo"
<Link href="/landing"
className="text-blueGray-700 hover:text-blueGray-500 text-xs uppercase py-3 font-bold block"
>
<i className="fas fa-newspaper text-blueGray-400 mr-2 text-sm"></i>{" "}
Landing Page
</a>
</Link>
</li>

<li className="items-center">
<Link href="/profile">
<a
href="#pablo"
<Link href="/profile"
className="text-blueGray-700 hover:text-blueGray-500 text-xs uppercase py-3 font-bold block"
>
<i className="fas fa-user-circle text-blueGray-400 mr-2 text-sm"></i>{" "}
Profile Page
</a>
</Link>
</li>
</ul>
Expand Down
Loading