Compare commits

...

11 Commits

5 changed files with 71 additions and 62 deletions

115
README.md
View File

@@ -1,83 +1,92 @@
# Mycelium Cloud Website # Project Mycelium Website
- **Repository:** [https://git.ourworld.tf/ourworld_web/www_project_mycelium/](https://git.ourworld.tf/ourworld_web/www_project_mycelium/)
- **Main Branch (Production):** [https://project.mycelium.tf/](https://project.mycelium.tf/)
- **Dev Branch (Staging):** [https://www2.project.mycelium.tf/](https://www2.project.mycelium.tf/)
---
## About
This is the official website for Mycelium Cloud, built using Next.js and Tailwind CSS. This is the official website for Mycelium Cloud, built using Next.js and Tailwind CSS.
## Getting Started ---
Follow these instructions to get a local copy up and running for development and testing purposes. ## Technologies
### Prerequisites - **Framework**: [Next.js](https://nextjs.org/)
- **Language**: [TypeScript](https://www.typescriptlang.org/)
- **Styling**: [Tailwind CSS](https://tailwindcss.com/)
Make sure you have Node.js and npm installed on your machine. You can download them from [nodejs.org](https://nodejs.org/). ---
### Installation ## File Structure
- **Pages**: To edit the content of a specific page, navigate to `src/app/(main)/`.
- **Components**: Reusable components are located in `src/components/`.
- **Images and Videos**: Add or modify images and videos in the `public/` directory. Images are in `public/images/` and videos are in `public/videos/`.
- **CSS**: Global styles can be found in `src/styles/tailwind.css`. Most styling is done using Tailwind CSS utility classes directly in the `.tsx` files.
---
## Branding
- **Font**: The primary font used is [Mulish](https://fonts.google.com/specimen/Mulish).
- **Logos**: Project logos are stored in `public/images/logos/`.
---
## Get Started
Follow these steps to get the project running locally:
1. **Install Dependencies**:
1. Clone the repository to your local machine.
2. Install the NPM packages:
```bash ```bash
npm install npm install
``` ```
### Running the Application 2. **Build the Project**:
To run the development server:
```bash
npm run dev
```
Open [http://localhost:3000](http://localhost:3000) in your browser to see the result.
## Git Workflow
We follow a branching model to ensure code quality and a stable production environment. All new work should be done on a feature branch.
1. **Switch to the `development` branch** and make sure it's up to date:
```bash ```bash
git checkout development npm run build
git pull origin development
``` ```
2. **Create a new feature branch** for your changes: 3. **Start the Development Server**:
```bash ```bash
git checkout -b your-feature-name npm run start
``` ```
3. **Make your changes and commit them**. ---
4. **Push your feature branch** to the remote repository: ## Contributing
```bash
git push origin your-feature-name
```
5. **Create a Pull Request** on GitHub from your feature branch to the `development` branch. - **Never update the `main` branch directly.** All changes must be reviewed and merged by the team through a pull request.
- **Always work on the `development` branch.** Create a feature branch from `development` and submit your pull request to `development`.
- **Request a review.** After submitting your pull request, ask the team to review and accept it into the `main` branch.
6. After the pull request is reviewed and merged, the changes will be on the `development` branch. To deploy to production, the `development` branch will be merged into `main`. ---
## Project Structure ## Report an Error
Here is an overview of the key directories in the project: To report an issue, please use the following link and provide the requested information:
- `src/app/(main)/page.tsx` - **Issue Tracker**: [git.ourworld.tf/ourworld_web/HOME/issues/new](https://git.ourworld.tf/ourworld_web/HOME/issues/new) and tag **OW Website & Wiki Project 2025**
This is the main entry point for the homepage.
- `src/components/` - See the current web rpoject on [OW Website & Wiki Project 2025](https://git.ourworld.tf/ourworld_web/-/projects/153)
This directory contains all the reusable React components used throughout the site. The main components rendered on the homepage (`src/app/(main)/page.tsx`) are:
- `HomeHero.tsx`
- `StackSection.tsx` (as `StackSectionPreview`)
- `BentoReviews.tsx`
- `WorldMap.tsx`
- `Steps.tsx`
- `Companies.tsx`
- `ClickableGallery.tsx`
- `CallToAction.tsx`
- `public/images/` When reporting an issue, please include:
All static images are stored here. You can find logos, gallery images, and other visual assets in this folder.
- `public/videos/` - **URL**: The page where the error occurred.
This folder contains video assets used on the site. - **Repo**: The repository you are working with.
- **Branch**: The specific branch you are on.
- **Problem**: A detailed description of the problem.
## License ---
This site template is a commercial product and is licensed under the [Tailwind Plus license](https://tailwindcss.com/plus/license). ## Questions
If you have any questions, you can reach out to [sashaastiadi](https://git.ourworld.tf/sashaastiadi).

View File

@@ -21,14 +21,11 @@ export default function Home() {
<section id="home-hero"> <section id="home-hero">
<HomeHero /> <HomeHero />
</section> </section>
<section id="technologies">
<StackSectionPreview />
</section>
<section id="network"> <section id="network">
<WorldMap /> <WorldMap />
</section> </section>
<section id="bento-reviews"> <section id="technologies">
<BentoReviews /> <StackSectionPreview />
</section> </section>
<section id="deploy"> <section id="deploy">
<Steps /> <Steps />
@@ -39,6 +36,9 @@ export default function Home() {
<section id="clickable-gallery"> <section id="clickable-gallery">
<ClickableGallery /> <ClickableGallery />
</section> </section>
<section id="bento-reviews">
<BentoReviews />
</section>
<section id="call-to-action"> <section id="call-to-action">
<CallToAction /> <CallToAction />
</section> </section>

View File

@@ -40,7 +40,7 @@ const row2 = logos.slice(6);
export function Companies() { export function Companies() {
return ( return (
<div id="companies" className="relative bg-black flex flex-col items-center justify-center w-full overflow-hidden antialiased py-4 -top-20"> <div id="companies" className="relative bg-black flex flex-col items-center justify-center w-full overflow-hidden antialiased py-4 mb-12">
<div className="relative z-10 mx-auto w-full max-w-6xl p-4"> <div className="relative z-10 mx-auto w-full max-w-6xl p-4">
{/* Heading */} {/* Heading */}

View File

@@ -5,7 +5,7 @@ import { motion } from 'framer-motion'
import { TypeAnimation } from 'react-type-animation' import { TypeAnimation } from 'react-type-animation'
import { Dialog, DialogPanel } from '@headlessui/react' import { Dialog, DialogPanel } from '@headlessui/react'
import { Bars3Icon, XMarkIcon, ChevronDoubleDownIcon } from '@heroicons/react/24/outline' import { Bars3Icon, XMarkIcon, ChevronDoubleDownIcon } from '@heroicons/react/24/outline'
import { H1, PL } from '@/components/Texts' import { H1, H2, PL } from '@/components/Texts'
const navigation = [ const navigation = [
{ name: 'Product', href: '#' }, { name: 'Product', href: '#' },
@@ -34,7 +34,7 @@ export function HomeHero() {
<div className="relative px-6 lg:px-8"> <div className="relative px-6 lg:px-8">
<div className="relative mx-auto flex h-screen max-w-8xl items-center justify-center"> <div className="relative mx-auto flex h-screen max-w-8xl items-center justify-center">
<div className="text-center"> <div className="text-center">
<div className="max-w-5xl"> <div className="max-w-6xl">
<H1 color="light"> <H1 color="light">
<TypeAnimation <TypeAnimation
sequence={[ sequence={[

View File

@@ -1,7 +1,7 @@
"use client"; "use client";
import { StackedCubes } from "@/components/ui/StackedCubes"; import { StackedCubes } from "@/components/ui/StackedCubes";
import { H2, P } from '@/components/Texts'; import { H1, H2, P } from '@/components/Texts';
import { FadeIn } from "./FadeIn"; import { FadeIn } from "./FadeIn";
export function StackSectionPreview() { export function StackSectionPreview() {