Skip to content

Commit

Permalink
reorg
Browse files Browse the repository at this point in the history
  • Loading branch information
htothenan1 committed Oct 27, 2023
1 parent 6fe64c4 commit a3eb0ac
Show file tree
Hide file tree
Showing 17 changed files with 129 additions and 28 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@ Darker Red (Selected): #D76A6A
Light Blue-Gray: #DCE2E6
Dark Text Color: Charcoal - #2B2B2B
Burnt Orange - #FF9F67
DCE2E6 blue
3e6b8e blue
4 changes: 2 additions & 2 deletions app/(site)/account/page.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ import { getUser } from "../../lib/items"
import { getServerSession } from "next-auth"
import PieChart from "../../components/PieChart"
import AccountDetails from "../../components/AccountDetails"
import NavBar from "../../common/NavBar"
import Footer from "../../common/Footer"
import NavBar from "../../components/NavBar"
import Footer from "../../components/Footer"
import styles from "../styles/account.module.css"
import { authOptions } from "../../api/auth/[...nextauth]/route"

Expand Down
18 changes: 9 additions & 9 deletions app/(site)/contact/page.js
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
import NavBar from "@/common/NavBar";
import ContactForm from "../../components/ContactForm";
import Footer from "../../common/Footer";
import { getUser } from "../../lib/items";
import { getServerSession } from "next-auth";
import { authOptions } from "../../api/auth/[...nextauth]/route";
import NavBar from "../../components/NavBar"
import ContactForm from "../../components/ContactForm"
import Footer from "../../components/Footer"
import { getUser } from "../../lib/items"
import { getServerSession } from "next-auth"
import { authOptions } from "../../api/auth/[...nextauth]/route"

export default async function Contact() {
const session = await getServerSession(authOptions);
const { user } = await getUser(session.user.email);
const session = await getServerSession(authOptions)
const { user } = await getUser(session.user.email)

return (
<>
<NavBar user={user?.name} />
<ContactForm />
<Footer />
</>
);
)
}
4 changes: 2 additions & 2 deletions app/(site)/kitchen/page.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { getUser } from "../../lib/items"
import { getServerSession } from "next-auth"
import NavBar from "../../common/NavBar"
import Footer from "../../common/Footer"
import NavBar from "../../components/NavBar"
import Footer from "../../components/Footer"
import Kitchen from "../../components/Kitchen"
import styles from "../styles/kitchen.module.css"
import { authOptions } from "../../api/auth/[...nextauth]/route"
Expand Down
4 changes: 2 additions & 2 deletions app/(site)/recipes/page.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { getUser } from "../../lib/items"
import { getServerSession } from "next-auth"
import NavBar from "../../common/NavBar"
import Footer from "../../common/Footer"
import NavBar from "../../components/NavBar"
import Footer from "../../components/Footer"
import ItemsChecklist from "../../components/ItemsChecklist"
import styles from "../styles/recipes.module.css"
import { authOptions } from "../../api/auth/[...nextauth]/route"
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions app/components/styles/accountDetails.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
top: 0;
left: 0;
width: 100%;
background-color: rgba(0, 0, 0, 0.5);
height: 100%;
background-color: #2b2b2b;
display: flex;
justify-content: center;
align-items: center;
Expand Down Expand Up @@ -36,7 +36,7 @@
display: inline-flex;
justify-content: center;
border-radius: 0.375rem;
background-color: #89c9a3;
background-color: #6da882;
padding: 0.5rem 0.75rem;
font-size: 0.875rem;
font-family: var(--font-quicksandBold);
Expand Down
2 changes: 1 addition & 1 deletion app/components/styles/contactForm.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,6 @@
background-color: #ff9f67;
padding: 0.625rem 0.875rem;
font-size: 0.875rem;
color: FDFCFB;
color: #fdfcfb;
font-family: var(--font-quicksand);
}
100 changes: 100 additions & 0 deletions app/components/styles/footer.module.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
.footerContainer {
background-color: white;
position: absolute;
bottom: 0;
left: 0;
width: 100%;
}

.innerFooter {
margin-left: auto;
margin-right: auto;
max-width: 112rem;
padding: 1rem 1.5rem;
}

@media (min-width: 768px) {
.innerFooter {
display: flex;
align-items: center;
justify-content: space-between;
}
.createdByContainer {
order: 2;
}
}

.createdByContainer {
display: flex;
justify-content: center;
gap: 1.5rem;
}

.creatorText {
text-align: center;
font-size: 0.75rem; /* corresponds to text-xs in TailwindCSS */
line-height: 1.25rem; /* corresponds to leading-5 in TailwindCSS */
color: #2b2b2b; /* corresponds to text-gray-500 in TailwindCSS */
font-family: var(--font-quicksand);
}

.footer-container {
background-color: #fafafa;
border-top: 1px solid #e0e0e0;
padding: 20px 0;
width: 100%;
position: fixed;
bottom: 0;
}

.footer-content {
max-width: 1200px;
margin: 0 auto;
display: flex;
justify-content: space-between;
align-items: center;
padding: 0 20px;
}

.copyright {
font-size: 14px;
color: #777;
}

.author-section {
display: flex;
align-items: center;
font-size: 14px;
}

.icons {
margin-left: 10px;
display: flex;
gap: 10px;
}

.icon-link i {
color: #555;
font-size: 20px;
transition: color 0.2s;
}

.icon-link:hover i {
color: #333;
}

@media (max-width: 600px) {
.footer-content {
flex-direction: column;
text-align: center;
}

.author-section {
margin-top: 10px;
gap: 10px;
}

.icons {
margin: 0;
}
}
5 changes: 3 additions & 2 deletions app/components/styles/itemsChecklist.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
display: grid;
grid-template-columns: repeat(3, 1fr);
border-radius: 0.375rem;
gap: 1px;
}

@media (min-width: 768px) {
Expand All @@ -42,7 +43,7 @@
border-radius: 0.375rem;
background-color: #f28c8c;
font-size: 0.875rem;
font-family: var(--font-quicksand);
font-family: var(--font-quicksandBold);
color: #2b2b2b;
}

Expand All @@ -52,7 +53,7 @@
border-radius: 0.375rem;
background-color: #89c9a3;
font-size: 0.875rem;
font-family: var(--font-quicksand);
font-family: var(--font-quicksandBold);
color: #2b2b2b;
}

Expand Down
8 changes: 4 additions & 4 deletions app/components/styles/singleItem.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
left: 0;
width: 100%;
height: 100%;
background-color: #2b2b2b;
background-color: rgba(0, 0, 0, 0.5);
display: flex;
justify-content: center;
align-items: center;
Expand Down Expand Up @@ -36,7 +36,7 @@
display: inline-flex;
justify-content: center;
border-radius: 0.375rem;
background-color: #89c9a3;
background-color: #6da882;
padding: 0.5rem 0.75rem;
font-size: 0.875rem;
font-family: var(--font-quicksandBold);
Expand All @@ -49,7 +49,7 @@
display: inline-flex;
justify-content: center;
border-radius: 0.375rem;
background-color: #f28c8c;
background-color: #d76a6a;
padding: 0.5rem 0.75rem;
font-size: 0.875rem;
font-family: var(--font-quicksandBold);
Expand Down Expand Up @@ -174,7 +174,7 @@
margin: 1rem 0;
padding: 0.5rem 0.75rem;
border-radius: 0.375rem;
background-color: #dce2e6;
background-color: #3e6b8e;
color: #ffffff;
font-size: 0.875rem;
}
Expand Down
2 changes: 1 addition & 1 deletion app/layout.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import "./globals.css"
import { Analytics } from "@vercel/analytics/react"
import { Quicksand } from "next/font/google"
import CustomToastContainer from "./common/CustomToastContainer"
import CustomToastContainer from "./components/CustomToastContainer"
import Provider from "./context/AuthContext"
import "react-toastify/dist/ReactToastify.css"
import "react-calendar/dist/Calendar.css"
Expand Down
4 changes: 2 additions & 2 deletions app/page.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
"use client"

import GuestNavBar from "./common/GuestNavBar"
import Footer from "./common/Footer"
import GuestNavBar from "./components/GuestNavBar"
import Footer from "./components/Footer"
import screenshot from "../public/waste-not.png"
import Image from "next/image"
import Lottie from "lottie-react"
Expand Down
Binary file modified public/waste-not.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit a3eb0ac

Please sign in to comment.