Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/npm_and_yarn/cubeseed_login/brows…
Browse files Browse the repository at this point in the history
…erify-sign-4.2.2
  • Loading branch information
mihrab34 authored Dec 4, 2023
2 parents 87858a1 + de1648c commit 8228ad6
Show file tree
Hide file tree
Showing 60 changed files with 620 additions and 653 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/eslint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,6 @@ jobs:

# Install Next Config
- run: npm install eslint-config-next --save-dev

# Run ESLint
- run: npx eslint .
# - run: npx eslint .
3 changes: 3 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"cSpell.words": ["loginoptions"]
}
3 changes: 1 addition & 2 deletions cubeseed_login/app/(farmer)/dashboard/invoice/page.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import ViewInvoice from "@cs/components/view-invoice";
import CreateInvoice from "../../../../components/create-invoice";
import ViewInvoice from "@/component/Invoice/view-invoice"

export default async function InvoicePage() {
return (
Expand Down
6 changes: 6 additions & 0 deletions cubeseed_login/app/(farmer)/dashboard/layout.tsx
Original file line number Diff line number Diff line change
@@ -1,12 +1,18 @@
import Navbar from "@/component/navbar/Navbar"
import DashboardNavbar from "@/component/dashboard/DashboardNavbar/DashboardNavbar"
import DashboardSidePannel from "@/component/dashboard/DashboardSidePannel"
import { Inter as FontSans } from "next/font/google"

export const metadata = {
title: "Next.js",
description: "Generated by Next.js",
}

const fontSans = FontSans({
variable: "--font-sans",
subsets: ["latin"],
})

export default function DashboardLayout({
children,
}: {
Expand Down
12 changes: 4 additions & 8 deletions cubeseed_login/app/(farmer)/dashboard/page.tsx
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
import CreateInvoice from "@cs/components/create-invoice";
import CreateSucess from "@cs/components/create-success";
import { useState } from "react";
// import CreateInvoice from "@/component/Invoice/create-invoice"
import CreateSucess from "@/component/Invoice/create-success"
import { useState } from "react"

export default async function DashboardPage() {
return (
<div>
<CreateInvoice />
</div>
);
return <div>{/* <CreateInvoice /> */}</div>
}
4 changes: 2 additions & 2 deletions cubeseed_login/app/(farmer)/dashboard/profiles/edit/page.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import EditUserProfile from "@cs/components/edit-profile"
import { Icons } from "@cs/components/icons"
import EditUserProfile from "@/component/Profile/edit-profile"
import { Icons } from "@/component/Icons/icons"

function EditProfilePage() {
return (
Expand Down
2 changes: 1 addition & 1 deletion cubeseed_login/app/(farmer)/dashboard/profiles/page.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import UserProfile from "@cs/components/profile"
import UserProfile from "@/component/Profile/profile"
import React from "react"
import EditProfilePage from "./edit/page"
const base64 = require("base-64")
Expand Down
25 changes: 0 additions & 25 deletions cubeseed_login/app/layout.tsx

This file was deleted.

243 changes: 0 additions & 243 deletions cubeseed_login/components/create-invoice.tsx

This file was deleted.

File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
13 changes: 0 additions & 13 deletions cubeseed_login/src/api/hello.ts

This file was deleted.

19 changes: 0 additions & 19 deletions cubeseed_login/src/api/login.js

This file was deleted.

File renamed without changes.
Loading

0 comments on commit 8228ad6

Please sign in to comment.