-
Notifications
You must be signed in to change notification settings - Fork 2
Experimental merge of designs #35
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
Merged
Merged
Changes from all commits
Commits
Show all changes
12 commits
Select commit
Hold shift + click to select a range
c832deb
Create mockup
Cykotech 95fac1c
Implement mockup in React
Jamesllllllllll 8de44f8
Create layout
Jamesllllllllll bbaf2cf
Button styling fix
Jamesllllllllll fd59208
Style upgrades
Jamesllllllllll 43b4c03
Add Inter from Google Fonts
Jamesllllllllll a9a5a25
Experiment with design changes
Cykotech e8cd606
Remove commented code
Cykotech 8985e72
Add new white background color
Cykotech 4948080
Convert hsl to hex
Cykotech 08bacd6
Delete mockup directory
Cykotech 411a11c
Merge branch 'main' into experimental-merge-of-designs
Cykotech File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| export default function CTA() { | ||
| return ( | ||
| <section | ||
| id="cta" | ||
| className="bg-primary flex justify-center items-center p-6 md:py-20" | ||
| > | ||
| <div className="cta-container bg-gradient-to-r from-accent to-secondary shadow-md rounded-3xl p-10 md:px-60 md:py-20 flex flex-col justify-evenly items-center text-primary"> | ||
| <h2 className="text-3xl font-bold mb-4 text-center"> | ||
| Ready to Join Our Community? | ||
| </h2> | ||
| <p className="text-center text-lg mb-6"> | ||
| Start your journey with Code Cafe today and become part of a thriving | ||
| developer community. | ||
| </p> | ||
| <a | ||
| className="discord-button bg-primary px-8 py-4 rounded-lg border-2 border-primary text-secondary hover:bg-secondary hover:text-primary transition-all hover:no-underline" | ||
| href="https://discord.gg/code-cafe" | ||
| > | ||
| Join Code Cafe | ||
| </a> | ||
| </div> | ||
| </section> | ||
| ); | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| import { Users, CircleHelp, BookOpen } from "lucide-react"; | ||
|
|
||
| export default function Features() { | ||
| return ( | ||
| <section className="bg-background py-20"> | ||
| <div className="outer"> | ||
| <div className="inner"> | ||
| <div className="flex-1 flex flex-col items-center text-center py-6"> | ||
| <Users size={48} className="text-accent mb-2" /> | ||
| <h3 className="text-secondary text-xl mb-2 font-mono"> | ||
| Active Community | ||
| </h3> | ||
| <p className="text-secondary text-sm"> | ||
| Connect with like-minded developers and build lasting | ||
| relationships. | ||
| </p> | ||
| </div> | ||
| <div className="self-center bg-[rgba(255,255,255,0.1)] bg-clip-border bg-origin-padding bg-scroll bg-repeat shadow-[0px_0px_70px_15px_rgba(0,0,0,0.75)] box-border text-white font-sans font-[cv05_ss01_ss03_zero] text-base leading-6 h-[100px] w-[1px] text-left hidden lg:block"></div> | ||
|
|
||
| <div className="flex-1 flex flex-col items-center text-center py-6 font-mono"> | ||
| <CircleHelp size={48} className="text-accent mb-2" /> | ||
| <h3 className="text-secondary text-xl mb-2">Some other thing</h3> | ||
| <p className="text-secondary text-sm"> | ||
| Description about that other thing. | ||
| </p> | ||
| </div> | ||
| <div className="self-center bg-[rgba(255,255,255,0.1)] bg-clip-border bg-origin-padding bg-scroll bg-repeat shadow-[0px_0px_70px_15px_rgba(0,0,0,0.75)] box-border text-white font-sans font-[cv05_ss01_ss03_zero] text-base leading-6 h-[100px] w-[1px] text-left hidden lg:block"></div> | ||
|
|
||
| <div className="flex-1 flex flex-col items-center text-center py-6"> | ||
| <BookOpen size={48} className="text-accent mb-2" /> | ||
| <h3 className="text-secondary text-xl mb-2 font-mono"> | ||
| Learning Resources | ||
| </h3> | ||
| <p className="text-secondary text-sm"> | ||
| Access curated learning materials and documentation. | ||
| </p> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </section> | ||
| ); | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| import { Link } from "react-router"; | ||
| import { Code } from "lucide-react"; | ||
|
|
||
| export default function Footer() { | ||
| return ( | ||
| <footer className="py-16 bg-background flex justify-around"> | ||
| <div className="footer-container text-primary"> | ||
| <h4 className="text-xl font-bold flex items-center gap-2"> | ||
| <Code size={48} className="text-primary" /> | ||
| Code Cafe | ||
| </h4> | ||
| <p className="text-sm">Your home for coding and community</p> | ||
| </div> | ||
| <div className="footer-container text-primary"> | ||
| <h4 className="text-xl font-bold mb-4">Community</h4> | ||
| <ul className="list-none"> | ||
| <li className="mb-3 text-sm"> | ||
| <Link to="/events">Events</Link> | ||
| </li> | ||
| <li className="mb-3 text-sm"> | ||
| <a href="https://discord.gg/code-cafe">Discord</a> | ||
| </li> | ||
| </ul> | ||
| </div> | ||
| <div className="footer-container text-primary"> | ||
| <h4 className="text-xl font-bold mb-4">Resources</h4> | ||
| <ul className="list-none"> | ||
| <li className="mb-3 text-sm">Documentation</li> | ||
| <li className="mb-3 text-sm">Blog</li> | ||
| <li className="mb-3 text-sm">GitHub</li> | ||
| </ul> | ||
| </div> | ||
| </footer> | ||
| ); | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| import { NavLink } from "react-router"; | ||
|
|
||
| export default function Header() { | ||
| return ( | ||
| <header className="sticky top-0 bg-primary/80 backdrop-blur-lg py-4 flex justify-around items-center"> | ||
| <div className="flex gap-2 items-center"> | ||
| <img | ||
| className="w-16" | ||
| src={"/images/coffee_cup.jpg"} | ||
| alt="Code Cafe Logo" | ||
| /> | ||
| <h1 className="text-secondary text-3xl">Code Cafe</h1> | ||
| </div> | ||
| <nav> | ||
| <ul className="flex list-none gap-3 text-secondary"> | ||
| <li> | ||
| <NavLink className="hover:text-accent" to="/"> | ||
| Home | ||
| </NavLink> | ||
| </li> | ||
| <li> | ||
| <NavLink className="hover:text-accent" to="/about"> | ||
| About Us | ||
| </NavLink> | ||
| </li> | ||
| <li> | ||
| <NavLink className="hover:text-accent" to="/events"> | ||
| Events | ||
| </NavLink> | ||
| </li> | ||
| </ul> | ||
| </nav> | ||
| </header> | ||
| ); | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| export default function Hero() { | ||
| return ( | ||
| <section | ||
| id="hero" | ||
| className="min-h-[8vh] bg-primary flex flex-col justify-evenly items-center text-accent py-8" | ||
| > | ||
| <div className="text-center flex items-center justify-center flex-wrap xl:flex-nowrap p-8 lg:p-5"> | ||
| <div className="flex flex-col items-center"> | ||
| <h2 className="text-xl md:text-xl lg:text-4xl mb-2"> | ||
| Where Code Meets Community | ||
| </h2> | ||
| <p className="font-mono text-lg max-w-prose"> | ||
| Join our vibrant community of developers, share knowledge and grow | ||
| together in a welcoming environment. | ||
| </p> | ||
| </div> | ||
| </div> | ||
| <div className="flex gap-10 my-6"> | ||
| <button className="px-8 py-4 text-primary rounded-lg border-2 border-secondary hover:border-secondary bg-secondary hover:text-secondary hover:bg-primary transition-all"> | ||
| Join us | ||
| </button> | ||
| </div> | ||
| </section> | ||
| ); | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| import Header from "./Header"; | ||
| import Footer from "./Footer"; | ||
| import { Outlet } from "react-router"; | ||
|
|
||
| export default function Layout() { | ||
| return ( | ||
| <> | ||
| <Header /> | ||
| <Outlet /> | ||
| <Footer /> | ||
| </> | ||
| ); | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,66 @@ | ||
| import { Smile } from "lucide-react"; | ||
|
|
||
| export default function Showcase() { | ||
| return ( | ||
| <section className="flex flex-col items-center bg-background py-20"> | ||
| <h2 className="text-xl md:text-xl lg:text-4xl mb-6 text-primary"> | ||
| Community Showcase | ||
| </h2> | ||
| <div className="flex flex-1"> | ||
| <div className="outer"> | ||
| <div className="inner min-h-full"> | ||
| <div className="flex-1 flex flex-col text-center px-6 py-6"> | ||
| <div className="flex flex-1 justify-start"> | ||
| <Smile size={48} className="text-accent mb-2 mr-4" /> | ||
| <h3 className="flex flex-col items-start text-secondary text-xl mb-2 font-mono"> | ||
| Sarah Johnson | ||
| <span className="text-sm">Task Manager App</span> | ||
| </h3> | ||
| </div> | ||
| <p className="text-secondary text-left text-md max-w-full"> | ||
| A sleek, intuitive task management application built with React | ||
| and Node.js. | ||
| </p> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| <div className="outer"> | ||
| <div className="inner min-h-full"> | ||
| <div className="flex-1 flex flex-col text-center px-6 py-6"> | ||
| <div className="flex flex-1 justify-start"> | ||
| <Smile size={48} className="text-accent mb-2 mr-4" /> | ||
| <h3 className="flex flex-col items-start text-secondary text-xl mb-2 font-mono"> | ||
| Mike Chen | ||
| <span className="text-sm">Weather Dashboard</span> | ||
| </h3> | ||
| </div> | ||
| <p className="text-secondary text-left text-md max-w-full"> | ||
| Real-time weather information visualized beautifully using D3.js | ||
| and OpenWeatherMap API. | ||
| </p> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| <div className="outer"> | ||
| <div className="inner min-h-full"> | ||
| <div className="flex-1 flex flex-col text-center px-6 py-6"> | ||
| <div className="flex flex-1 justify-start"> | ||
| <Smile size={48} className="text-accent mb-2 mr-4" /> | ||
| <h3 className="flex flex-col items-start text-secondary text-xl mb-2 font-mono"> | ||
| Emily Rodriguez | ||
| <span className="text-sm">Code Snippet Library</span> | ||
| </h3> | ||
| </div> | ||
| <p className="text-secondary text-left text-md max-w-full"> | ||
| A collaborative platform for developers to share and discover | ||
| useful code snippets. | ||
| </p> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| {/* </div>*/} | ||
| {/*</div>*/} | ||
|
Comment on lines
+62
to
+63
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. can be removed |
||
| </section> | ||
| ); | ||
| } | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Not sure if we're even using this font. I deleted this locally and nothing changed.