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

New site #1

Merged
merged 73 commits into from
Jun 7, 2024
Merged
Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
73 commits
Select commit Hold shift + click to select a range
6340e2a
next setup and homepage ui
chrisfromhubql May 20, 2024
0f919ce
build service, community and contact page
chrisfromhubql May 24, 2024
5818035
fix content and links
chrisfromhubql May 24, 2024
5698b68
ci: add preview deploy
danstarns May 27, 2024
051aba5
ci: name changes
danstarns May 27, 2024
80054dc
remove dark theme - not in use
chrisfromhubql May 28, 2024
31ffa8f
images: add raw images to use for services
danstarns May 29, 2024
d5093bb
images: remove graphql meetups from homepage and add devtools asia logo
danstarns May 29, 2024
d01014b
ci: pull correct branch for preview
danstarns May 29, 2024
876f510
content: add youtube videos
danstarns May 29, 2024
ef72f40
map: add more locations
danstarns May 29, 2024
03ab7f4
content: add more text around services and community
danstarns May 30, 2024
87a1919
styling: update for dark mode and fix service card image size
chrisfromhubql May 30, 2024
537c27b
images: remove non svgs and add oursky
danstarns May 30, 2024
b87aa0c
content: add visable page header and move logos to bottom for non hom…
danstarns May 30, 2024
1955421
style: blue cta 'connect'
danstarns May 30, 2024
0144bde
style: add gap to videos
danstarns May 30, 2024
3170eec
content: add about page with inital content
danstarns May 30, 2024
6ab85ab
content: add header to contact page
danstarns May 30, 2024
0b77570
content: about wording
danstarns May 30, 2024
cae8c99
fix: correct tab header for about page
danstarns May 30, 2024
669097e
footer: update services
danstarns May 30, 2024
fe4dde6
content: add image and text to contact page
danstarns Jun 1, 2024
9b8cb9d
content: add text under headers on homepage
danstarns Jun 1, 2024
6a3499c
style: contact form colors
danstarns Jun 1, 2024
1b40a07
style: opacity images and add border
danstarns Jun 1, 2024
9c3d4a1
style: dark text on sheet light mode expand
danstarns Jun 2, 2024
421c2c6
image: fix github logo svg
danstarns Jun 2, 2024
24d6f96
style: overall responsiveness and new hero layout
chrisfromhubql Jun 3, 2024
395db68
style: font size footer
chrisfromhubql Jun 3, 2024
7ba7b22
style: page name color
chrisfromhubql Jun 3, 2024
1487d5b
ci: build project on github runner to report build errors
danstarns Jun 5, 2024
e861450
ci: remove pnpm usage
danstarns Jun 5, 2024
8eed6a1
ci: remove cache
danstarns Jun 5, 2024
251e7c4
fix: build errors
danstarns Jun 5, 2024
91e0025
new blog
chrisfromhubql Jun 5, 2024
306370e
feat: add header and social proof to blog page
danstarns Jun 5, 2024
eeddc6a
style: BlogPosts
danstarns Jun 5, 2024
4ea6b9e
style: BlogPosts
danstarns Jun 5, 2024
8eaeadc
feat: add inital blog content
danstarns Jun 6, 2024
2e14ba2
add theme switch and update metadata and update theme
chrisfromhubql Jun 6, 2024
9281b63
Merge pull request #2 from rocket-connect/blog
danstarns Jun 6, 2024
0e40bb7
content: add kodingakademi logo
danstarns Jun 6, 2024
4229758
refactor: add global content file and reuse main header
danstarns Jun 6, 2024
feeab87
content: *
danstarns Jun 6, 2024
fedcba4
content: add links to services
danstarns Jun 6, 2024
36ed2f0
content: *
danstarns Jun 6, 2024
3634584
content: changes to communities directory
danstarns Jun 6, 2024
e952d80
feat: add link for home services
danstarns Jun 6, 2024
b6afabf
feat: add google tag
danstarns Jun 6, 2024
0020675
seo: add tag manager
danstarns Jun 6, 2024
38f01ba
refactor: make clear preview google
danstarns Jun 6, 2024
efef9eb
content: *
danstarns Jun 6, 2024
59f0584
refactor: remove old backend and use next route, remove two monorepo …
danstarns Jun 6, 2024
285fa0b
fix: email build errors
danstarns Jun 6, 2024
16890c5
fix: lock
danstarns Jun 6, 2024
8024f5b
feat: add src dir
danstarns Jun 6, 2024
b972965
fix: monorepo *
danstarns Jun 7, 2024
920bdce
package: fix *
danstarns Jun 7, 2024
6eeb3cd
feat: hookup the frontend contact form
danstarns Jun 7, 2024
84c1f35
refactor: remove old env
danstarns Jun 7, 2024
647858e
meta: *
danstarns Jun 7, 2024
b8e845b
fix: *
danstarns Jun 7, 2024
a466103
seo: add intro to metadata
danstarns Jun 7, 2024
719ae9d
refactor: remove tag manager
danstarns Jun 7, 2024
3558a23
seo: add ga_key env
danstarns Jun 7, 2024
414c2bf
dev: add prettier and eslint and fix errors
danstarns Jun 7, 2024
c950ae6
dev: format all files
danstarns Jun 7, 2024
9135820
content: update default banner
danstarns Jun 7, 2024
0944987
content: change preview to png
danstarns Jun 7, 2024
7696f17
dev: add lint to pipelines
danstarns Jun 7, 2024
d38256f
ci: ready for main
danstarns Jun 7, 2024
af0a7cc
ci: add pr checks
danstarns Jun 7, 2024
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
28 changes: 28 additions & 0 deletions .github/workflows/deploy-preview.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
name: preview.rconnect.tech

on:
push:
branches:
- new-site

jobs:
deploy-preview:
runs-on: ubuntu-latest

steps:
- name: SSH and deploy node app
uses: appleboy/ssh-action@master
with:
host: ${{ secrets.SSH_HOST }}
username: ${{ secrets.SSH_USERNAME }}
key: ${{ secrets.SSH_KEY }}
script: |
export NVM_DIR=~/.nvm
source ~/.nvm/nvm.sh
cd ./preview/rconnect.tech
git reset --hard
git pull origin main
cd ./frontend
npm install
npm run build
pm2 restart preview
2 changes: 0 additions & 2 deletions frontend/.env.example

This file was deleted.

3 changes: 3 additions & 0 deletions frontend/.eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"extends": "next/core-web-vitals"
}
36 changes: 36 additions & 0 deletions frontend/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.

# dependencies
/node_modules
/.pnp
.pnp.js
.yarn/install-state.gz

# testing
/coverage

# next.js
/.next/
/out/

# production
/build

# misc
.DS_Store
*.pem

# debug
npm-debug.log*
yarn-debug.log*
yarn-error.log*

# local env files
.env*.local

# vercel
.vercel

# typescript
*.tsbuildinfo
next-env.d.ts
36 changes: 36 additions & 0 deletions frontend/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
This is a [Next.js](https://nextjs.org/) project bootstrapped with [`create-next-app`](https://github.com/vercel/next.js/tree/canary/packages/create-next-app).

## Getting Started

First, run the development server:

```bash
npm run dev
# or
yarn dev
# or
pnpm dev
# or
bun dev
```

Open [http://localhost:3000](http://localhost:3000) with your browser to see the result.

You can start editing the page by modifying `app/page.tsx`. The page auto-updates as you edit the file.

This project uses [`next/font`](https://nextjs.org/docs/basic-features/font-optimization) to automatically optimize and load Inter, a custom Google Font.

## Learn More

To learn more about Next.js, take a look at the following resources:

- [Next.js Documentation](https://nextjs.org/docs) - learn about Next.js features and API.
- [Learn Next.js](https://nextjs.org/learn) - an interactive Next.js tutorial.

You can check out [the Next.js GitHub repository](https://github.com/vercel/next.js/) - your feedback and contributions are welcome!

## Deploy on Vercel

The easiest way to deploy your Next.js app is to use the [Vercel Platform](https://vercel.com/new?utm_medium=default-template&filter=next.js&utm_source=create-next-app&utm_campaign=create-next-app-readme) from the creators of Next.js.

Check out our [Next.js deployment documentation](https://nextjs.org/docs/deployment) for more details.
30 changes: 30 additions & 0 deletions frontend/app/community/layout.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
import type { Metadata } from "next";
import { Rubik } from "next/font/google";
import "../globals.css";

const rubik = Rubik({ subsets: ["latin"] });

export const metadata: Metadata = {
title: "Community | Rocket Connect",
description: "We connect people through open source.",
};

export default function RootLayout({
children,
}: Readonly<{
children: React.ReactNode;
}>) {
return (
<html lang="en">
<head>
<link
rel="icon"
href="/icon?<generated>"
type="image/<generated>"
sizes="<generated>"
/>
</head>
<body className={rubik.className}>{children}</body>
</html>
);
}
32 changes: 32 additions & 0 deletions frontend/app/community/page.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
"use client";
import dynamic from "next/dynamic";
import { Hero } from "@/components/shared/Hero";
import { SocialProofSection } from "@/components/templates/SocialProofSection";
import { Footer } from "@/components/shared/Footer";
import { Header } from "@/components/shared/Header";
import { Main } from "@/components/shared/Main";
import { services } from "@/content/services";
import { community } from "@/content/community";
import { CommunitySection } from "@/components/templates/CommunitySection";
import { Cta } from "@/components/shared/Cta";
import { DirectorySection } from "@/components/templates/DirectorySection";

const LazyMap = dynamic(() => import("@/components/templates/MapSection"), {
ssr: false,
loading: () => <p>Loading...</p>,
});

export default function Services() {
return (
<Main>
<Header />
<Hero content={community.hero} />
<SocialProofSection />
<LazyMap content={community.activity} />
<DirectorySection content={community.directory} />
<CommunitySection content={community.featuredVideos} />
<Cta />
<Footer />
</Main>
);
}
30 changes: 30 additions & 0 deletions frontend/app/contact/layout.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
import type { Metadata } from "next";
import { Rubik } from "next/font/google";
import "../globals.css";

const rubik = Rubik({ subsets: ["latin"] });

export const metadata: Metadata = {
title: "Contact us | Rconnect.tech",
description: "We connect people through open source.",
};

export default function RootLayout({
children,
}: Readonly<{
children: React.ReactNode;
}>) {
return (
<html lang="en">
<head>
<link
rel="icon"
href="/icon?<generated>"
type="image/<generated>"
sizes="<generated>"
/>
</head>
<body className={rubik.className}>{children}</body>
</html>
);
}
34 changes: 34 additions & 0 deletions frontend/app/contact/page.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
import { Hero } from "@/components/shared/Hero";
import { SocialProofSection } from "@/components/templates/SocialProofSection";
import { TwoColumn } from "@/components/shared/TwoColumn";
import { Cta } from "@/components/shared/Cta";
import { Footer } from "@/components/shared/Footer";
import { Header } from "@/components/shared/Header";
import { Main } from "@/components/shared/Main";
import { services } from "@/content/services";
import type { Metadata } from "next";
import Image from "next/image";
import { Input } from "@/components/ui/input";
import { Textarea } from "@/components/ui/textarea";
import { Button } from "@/components/ui/button";

const content = { h1: { title: "We connect people through open source" } };

export default function Services() {
return (
<Main>
<Header />
<Hero content={content} cta={false} />
<div className="w-full py-8">
<div className="max-w-2xl bg-[#FCFCFF] border border-[#E6E6FF] p-8 mx-auto rounded-lg flex flex-col gap-4 items-center">
<Input placeholder="Your name" />
<Input placeholder="Your email" />
<Textarea placeholder="Your message" />
<Button>Send your message</Button>
</div>
</div>
<SocialProofSection />
<Footer />
</Main>
);
}
25 changes: 25 additions & 0 deletions frontend/app/globals.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
@tailwind base;
@tailwind components;
@tailwind utilities;

:root {
--foreground: #1A2735;
--background: #FFFFFF;

}

body {
color: var(--foreground);
background:var(--background)
}

@layer utilities {
.text-balance {
text-wrap: balance;
}
}

.leaflet-div-icon {
background: transparent !important;
border: none !important;
}
57 changes: 57 additions & 0 deletions frontend/app/icon.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
import { ImageResponse } from "next/og";
import React from "react";

// Route segment config
export const runtime = "edge";

// Image metadata
export const size = {
width: 32,
height: 32,
};
export const contentType = "image/png";

// Image generation
export default function Icon() {
return new ImageResponse(
(
<div
style={{
width: "100%",
height: "100%",
display: "flex",
alignItems: "center",
justifyContent: "center",
}}
>
<svg
width="32"
height="32"
viewBox="0 0 56 57"
fill="none"
xmlns="http://www.w3.org/2000/svg"
>
<path
d="M54.117 24.0235L32.5459 2.45229C30.0352 -0.0583174 25.9647 -0.058314 23.4541 2.45229L1.88295 24.0235C-0.627653 26.5341 -0.62765 30.6046 1.88296 33.1152L23.4541 54.6864C25.9647 57.197 30.0352 57.197 32.5459 54.6864L54.117 33.1152C56.6277 30.6046 56.6277 26.5341 54.117 24.0235Z"
fill="#1A2735"
/>
<path
d="M31.6403 28.3488H26.7038C25.6329 28.3488 25.0533 29.6238 25.7477 30.4525L32.3485 38.3311C32.5871 38.6159 32.9366 38.78 33.3047 38.78H38.2411C39.3121 38.78 39.8916 37.505 39.1973 36.6763L32.5964 28.7977C32.3578 28.5129 32.0083 28.3488 31.6403 28.3488Z"
fill="#FFBF14"
/>
<path
d="M38.4201 19.455C37.4713 18.3529 36.1005 17.7207 34.6595 17.7207H19.067C17.5194 17.7207 16.2649 18.9957 16.2649 20.5684C16.2649 22.1412 17.5194 23.4162 19.067 23.4162H31.54C32.5873 23.4162 33.5899 23.8482 34.318 24.6133L34.7976 25.1174C36.058 26.4418 38.1483 26.4384 39.4045 25.1099C40.5547 23.8935 40.5985 21.9853 39.5055 20.7157L38.4201 19.455Z"
fill="#C4C7CA"
/>
<path
d="M16.189 31.441C16.189 29.855 17.4541 28.5693 19.0147 28.5693C20.5752 28.5693 21.8403 29.855 21.8403 31.441V36.5463C21.8403 38.1323 20.5752 39.4179 19.0147 39.4179C17.4541 39.4179 16.189 38.1323 16.189 36.5463V31.441Z"
fill="#00A5AA"
/>
</svg>
</div>
),
{
...size,
}
);
}
30 changes: 30 additions & 0 deletions frontend/app/layout.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
import type { Metadata } from "next";
import { Rubik } from "next/font/google";
import "./globals.css";

const rubik = Rubik({ subsets: ["latin"] });

export const metadata: Metadata = {
title: "Rocket Connect",
description: "We connect people through open source.",
};

export default function RootLayout({
children,
}: Readonly<{
children: React.ReactNode;
}>) {
return (
<html lang="en">
<head>
<link
rel="icon"
href="/icon?<generated>"
type="image/<generated>"
sizes="<generated>"
/>
</head>
<body className={rubik.className}>{children}</body>
</html>
);
}
23 changes: 23 additions & 0 deletions frontend/app/page.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
import { CommunitySection } from "@/components/templates/CommunitySection";
import { Hero } from "@/components/shared/Hero";
import { ServicesSection } from "@/components/templates/ServicesSection";
import { SocialProofSection } from "@/components/templates/SocialProofSection";
import { Cta } from "@/components/shared/Cta";
import { Footer } from "@/components/shared/Footer";
import { Header } from "@/components/shared/Header";
import { Main } from "@/components/shared/Main";
import { home } from "@/content/home";

export default function Home() {
return (
<Main>
<Header />
<Hero content={home.hero} />
<SocialProofSection />
<ServicesSection content={home.services} />
<CommunitySection content={home.community} />
<Cta />
<Footer />
</Main>
);
}
Loading