Skip to content

Commit

Permalink
Merge branch 'main' into organizers-update
Browse files Browse the repository at this point in the history
  • Loading branch information
Antosha9108 authored Nov 22, 2023
2 parents c99f8d8 + 4356837 commit 286373c
Show file tree
Hide file tree
Showing 5 changed files with 48 additions and 11 deletions.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
First, run the development server:

```bash
npm i next
npm run dev
```
Create an .env file and add these variables:
Expand Down
36 changes: 28 additions & 8 deletions app/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,15 @@ import Link from "next/link";
import Image from "next/image";
import Discord from "@/assets/images/Discord.svg";
import LinkedIn from "@/assets/images/LinkedIn.svg";
import X from "@/assets/images/x.svg";
import Meetup from "@/assets/images/meetup.svg";

const buttons = [
{
id: 1,
title: "Feature Sign Up",
link: "/features",
color: "bg-yellow-400",
title: "About",
link: "/about",
color: "bg-[#EA891D]",
},
{
id: 2,
Expand All @@ -19,21 +21,27 @@ const buttons = [
},
{
id: 3,
title: "Code & Coffee Chapters",
title: "Chapters",
link: "/chapters",
color: "bg-rose-600",
},
{
id: 4,
title: "Photos from past events",
title: "Photos",
link: "/pastEvents",
color: "bg-cyan-500",
},
{
id: 5,
title: "About",
link: "/about",
color: "bg-[#EA891D]",
title: "Features",
link: "/features",
color: "bg-yellow-400",
},
{
id: 6,
title: "Feedback",
link: "/#",
color: "bg-[#A73C93]",
},
];

Expand All @@ -50,6 +58,18 @@ const social_media = [
link: "https://www.linkedin.com/company/boston-code-and-coffee",
image: LinkedIn,
},
{
id : 3,
title: "X",
link: "/#",
image: X,
},
{
id : 4,
title: "Meetup",
link: "https://www.meetup.com/boston-code-and-coffee/",
image: Meetup,
},
];

export default function Home() {
Expand Down
5 changes: 5 additions & 0 deletions assets/images/meetup.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions assets/images/x.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 9 additions & 3 deletions changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -55,15 +55,21 @@ N/A
- Removed David Venegas
- Removed h2 'Meet Our Volunteers!'
---
## [1.1.3] - 2023-10-09
### Added
- Instructions in README to install Next.js

## [1.1.2] - 2023-09-16
### Added
- New Feedback button and Social media buttons for X and Meetup
### Updated
- Reordered main page buttons


## [1.1.1] - 2023-08-24
### Updated
- Updated Nicole Lyu's picture in Organizers page

---


## [1.1.0] - 2023-08-20

### Added
Expand Down

0 comments on commit 286373c

Please sign in to comment.