Skip to content

Commit

Permalink
Minor bugfixes
Browse files Browse the repository at this point in the history
do not elaborate any further.
  • Loading branch information
gregory-buffard committed Apr 30, 2024
1 parent 1bb33a5 commit e46b2f4
Show file tree
Hide file tree
Showing 51 changed files with 835 additions and 747 deletions.
54 changes: 47 additions & 7 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Docker Login
uses: docker/login-action@v3.1.0
Expand All @@ -29,20 +29,60 @@ jobs:
context: ./web
file: ./web/Dockerfile
push: true
tags: ghcr.io/${{github.repository_owner}}/g-yachts-web:${{github.sha}}
tags: ghcr.io/${{github.repository_owner}}/g-yachts-web:${{github.sha}

- name: Build and push API
uses: docker/build-push-action@v5.3.0
with:
context: ./api
file: ./api/Dockerfile
push: true
tags: ghcr.io/${GITHUB_OWNER}/g-yachts-api:${GITHUB_SHA}

Deploy:
runs-on: ubuntu-latest
needs: Build

env:
GITHUB_OWNER: ${{github.repository_owner}}
GITHUB_SHA: ${{github.sha}}
CURRENCY_API_KEY: ${{secrets.CURRENCY_API}}
MONGO_URI: mongodb://${{secrets.SERVER_IP}}:27017
MONGO_USER: ${{secrets.MONGO_USER}}
MONGO_PASS: ${{secrets.MONGO_PASS}}
SUBNET_IP: ${{secrets.SUBNET_WEB_IP}}

steps:
- name: Deploy
- name: Checkout
uses: actions/checkout@v4

- name: SSH
uses: appleboy/ssh-action@master
with:
host: ${{secrets.SERVER_IP}}
username: ${{secrets.SERVER_USER}}
password: ${{secrets.SERVER_PASSWORD}}
script: |
sudo mkdir -p /var/www/docker
cd /var/www/docker
- name: Transfer Compose
uses: appleboy/scp-action@master
with:
host: ${{secrets.SERVER_IP}}
username: ${{secrets.SERVER_USER}}
password: ${{secrets.SERVER_PASSWORD}}
source: ./docker-compose.yml
target: /var/www/docker

- name: Start Services
uses: appleboy/ssh-action@master
with:
host: ${{secrets.SERVER_IP}}
username: ${{secrets.SERVER_USER}}
password: ${{secrets.SERVER_PASSWORD}}
script: |
sudo docker pull ghcr.io/${{github.repository_owner}}/g-yachts-web:${{github.sha}}
sudo docker stop g-yachts-web || true
sudo docker rm g-yachts-web || true
sudo docker run -d --name g-yachts-web --network="host" -p 3000:3000 -e CURRENCY_API_KEY=${{secrets.CURRENCY_API}} -e MONGO_URI=mongodb://${{secrets.SERVER_IP}}:27017 -e MONGO_USER=${{secrets.MONGO_USER}} -e MONGO_PASS=${{secrets.MONGO_PASS}} ghcr.io/${{github.repository_owner}}/g-yachts-web:${{github.sha}}
cd /var/www/docker
docker-compose pull
docker-compose down
docker-compose up -d
16 changes: 16 additions & 0 deletions admin/app/actions.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
"use server";

export const uploadImages = async (formData: FormData, id: string) => {
const rawFormData = formData.getAll("images");
const d = new FormData();
rawFormData.forEach((f) => d.append("images", f));
try {
const res = await fetch(`${process.env.API_URL}/yachts/images/${id}`, {
method: "POST",
body: d,
});
return await res.json();
} catch (e) {
console.error(e);
}
};
29 changes: 0 additions & 29 deletions admin/app/globals.css
Original file line number Diff line number Diff line change
Expand Up @@ -2,32 +2,3 @@
@tailwind components;
@tailwind utilities;

:root {
--foreground-rgb: 0, 0, 0;
--background-start-rgb: 214, 219, 220;
--background-end-rgb: 255, 255, 255;
}

@media (prefers-color-scheme: dark) {
:root {
--foreground-rgb: 255, 255, 255;
--background-start-rgb: 0, 0, 0;
--background-end-rgb: 0, 0, 0;
}
}

body {
color: rgb(var(--foreground-rgb));
background: linear-gradient(
to bottom,
transparent,
rgb(var(--background-end-rgb))
)
rgb(var(--background-start-rgb));
}

@layer utilities {
.text-balance {
text-wrap: balance;
}
}
8 changes: 2 additions & 6 deletions admin/app/layout.tsx
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
import type { Metadata } from "next";
import { Inter } from "next/font/google";
import "./globals.css";

const inter = Inter({ subsets: ["latin"] });

export const metadata: Metadata = {
title: "Create Next App",
title: "Administration",
description: "Generated by create next app",
};

Expand All @@ -16,7 +12,7 @@ export default function RootLayout({
}>) {
return (
<html lang="en">
<body className={inter.className}>{children}</body>
<body>{children}</body>
</html>
);
}
125 changes: 16 additions & 109 deletions admin/app/page.tsx
Original file line number Diff line number Diff line change
@@ -1,113 +1,20 @@
import Image from "next/image";
"use client";

export default function Home() {
return (
<main className="flex min-h-screen flex-col items-center justify-between p-24">
<div className="z-10 w-full max-w-5xl items-center justify-between font-mono text-sm lg:flex">
<p className="fixed left-0 top-0 flex w-full justify-center border-b border-gray-300 bg-gradient-to-b from-zinc-200 pb-6 pt-8 backdrop-blur-2xl dark:border-neutral-800 dark:bg-zinc-800/30 dark:from-inherit lg:static lg:w-auto lg:rounded-xl lg:border lg:bg-gray-200 lg:p-4 lg:dark:bg-zinc-800/30">
Get started by editing&nbsp;
<code className="font-mono font-bold">app/page.tsx</code>
</p>
<div className="fixed bottom-0 left-0 flex h-48 w-full items-end justify-center bg-gradient-to-t from-white via-white dark:from-black dark:via-black lg:static lg:size-auto lg:bg-none">
<a
className="pointer-events-none flex place-items-center gap-2 p-8 lg:pointer-events-auto lg:p-0"
href="https://vercel.com?utm_source=create-next-app&utm_medium=appdir-template&utm_campaign=create-next-app"
target="_blank"
rel="noopener noreferrer"
>
By{" "}
<Image
src="/vercel.svg"
alt="Vercel Logo"
className="dark:invert"
width={100}
height={24}
priority
/>
</a>
</div>
</div>

<div className="relative z-[-1] flex place-items-center before:absolute before:h-[300px] before:w-full before:-translate-x-1/2 before:rounded-full before:bg-gradient-radial before:from-white before:to-transparent before:blur-2xl before:content-[''] after:absolute after:-z-20 after:h-[180px] after:w-full after:translate-x-1/3 after:bg-gradient-conic after:from-sky-200 after:via-blue-200 after:blur-2xl after:content-[''] before:dark:bg-gradient-to-br before:dark:from-transparent before:dark:to-blue-700 before:dark:opacity-10 after:dark:from-sky-900 after:dark:via-[#0141ff] after:dark:opacity-40 sm:before:w-[480px] sm:after:w-[240px] before:lg:h-[360px]">
<Image
className="relative dark:drop-shadow-[0_0_0.3rem_#ffffff70] dark:invert"
src="/next.svg"
alt="Next.js Logo"
width={180}
height={37}
priority
/>
</div>

<div className="mb-32 grid text-center lg:mb-0 lg:w-full lg:max-w-5xl lg:grid-cols-4 lg:text-left">
<a
href="https://nextjs.org/docs?utm_source=create-next-app&utm_medium=appdir-template&utm_campaign=create-next-app"
className="group rounded-lg border border-transparent px-5 py-4 transition-colors hover:border-gray-300 hover:bg-gray-100 hover:dark:border-neutral-700 hover:dark:bg-neutral-800/30"
target="_blank"
rel="noopener noreferrer"
>
<h2 className="mb-3 text-2xl font-semibold">
Docs{" "}
<span className="inline-block transition-transform group-hover:translate-x-1 motion-reduce:transform-none">
-&gt;
</span>
</h2>
<p className="m-0 max-w-[30ch] text-sm opacity-50">
Find in-depth information about Next.js features and API.
</p>
</a>

<a
href="https://nextjs.org/learn?utm_source=create-next-app&utm_medium=appdir-template-tw&utm_campaign=create-next-app"
className="group rounded-lg border border-transparent px-5 py-4 transition-colors hover:border-gray-300 hover:bg-gray-100 hover:dark:border-neutral-700 hover:dark:bg-neutral-800/30"
target="_blank"
rel="noopener noreferrer"
>
<h2 className="mb-3 text-2xl font-semibold">
Learn{" "}
<span className="inline-block transition-transform group-hover:translate-x-1 motion-reduce:transform-none">
-&gt;
</span>
</h2>
<p className="m-0 max-w-[30ch] text-sm opacity-50">
Learn about Next.js in an interactive course with&nbsp;quizzes!
</p>
</a>
import { uploadImages } from "@/app/actions";

<a
href="https://vercel.com/templates?framework=next.js&utm_source=create-next-app&utm_medium=appdir-template&utm_campaign=create-next-app"
className="group rounded-lg border border-transparent px-5 py-4 transition-colors hover:border-gray-300 hover:bg-gray-100 hover:dark:border-neutral-700 hover:dark:bg-neutral-800/30"
target="_blank"
rel="noopener noreferrer"
>
<h2 className="mb-3 text-2xl font-semibold">
Templates{" "}
<span className="inline-block transition-transform group-hover:translate-x-1 motion-reduce:transform-none">
-&gt;
</span>
</h2>
<p className="m-0 max-w-[30ch] text-sm opacity-50">
Explore starter templates for Next.js.
</p>
</a>

<a
href="https://vercel.com/new?utm_source=create-next-app&utm_medium=appdir-template&utm_campaign=create-next-app"
className="group rounded-lg border border-transparent px-5 py-4 transition-colors hover:border-gray-300 hover:bg-gray-100 hover:dark:border-neutral-700 hover:dark:bg-neutral-800/30"
target="_blank"
rel="noopener noreferrer"
>
<h2 className="mb-3 text-2xl font-semibold">
Deploy{" "}
<span className="inline-block transition-transform group-hover:translate-x-1 motion-reduce:transform-none">
-&gt;
</span>
</h2>
<p className="m-0 max-w-[30ch] text-balance text-sm opacity-50">
Instantly deploy your Next.js site to a shareable URL with Vercel.
</p>
</a>
</div>
const Home = () => {
return (
<main className="w-full h-screen flex justify-center items-center">
<form
action={async (formData) => {
await uploadImages(formData, "662810408f1b183f77e99b57");
}}
>
<input type={"file"} name={"images"} multiple />
<button type={"submit"}>Upload</button>
</form>
</main>
);
}
};

export default Home;
Loading

0 comments on commit e46b2f4

Please sign in to comment.