Compare commits

...

4 Commits

Author SHA1 Message Date
sriram veeraghanta
0d05556ad9 fix: removing get service side props from onboarding page 2023-04-05 15:04:21 -04:00
sriram veeraghanta
39f151ce73 index page redirection 2023-04-05 14:40:36 -04:00
pablohashescobar
d45979eacb dev: update worker script and update yml file to point to org 2023-04-01 20:07:22 +05:30
pablohashescobar
f124355809 build: add docker compose for building from hub 2023-04-01 19:46:10 +05:30
4 changed files with 103 additions and 24 deletions

View File

@ -2,5 +2,4 @@
set -e
python manage.py wait_for_db
python manage.py migrate
python manage.py rqworker

View File

@ -1,13 +1,15 @@
// lib
import { useEffect } from "react";
import { homePageRedirect } from "lib/auth";
// types
import type { NextPage, NextPageContext } from "next";
import { useRouter } from "next/router";
const Home: NextPage = () => null;
const Home: NextPage = () => {
const router = useRouter();
export const getServerSideProps = (ctx: NextPageContext) => {
const cookies = ctx.req?.headers.cookie;
return homePageRedirect(cookies);
useEffect(() => {
router.push("/onboarding");
}, []);
return <>loading</>;
};
export default Home;

View File

@ -90,25 +90,25 @@ const Onboarding: NextPage = () => {
);
};
export const getServerSideProps = async (ctx: GetServerSidePropsContext) => {
const user = await requiredAuth(ctx.req?.headers.cookie);
// export const getServerSideProps = async (ctx: GetServerSidePropsContext) => {
// const user = await requiredAuth(ctx.req?.headers.cookie);
const redirectAfterSignIn = ctx.resolvedUrl;
// const redirectAfterSignIn = ctx.resolvedUrl;
if (!user) {
return {
redirect: {
destination: `/signin?next=${redirectAfterSignIn}`,
permanent: false,
},
};
}
// if (!user) {
// return {
// redirect: {
// destination: `/signin?next=${redirectAfterSignIn}`,
// permanent: false,
// },
// };
// }
return {
props: {
user,
},
};
};
// return {
// props: {
// user,
// },
// };
// };
export default Onboarding;

78
docker-compose.hub.yml Normal file
View File

@ -0,0 +1,78 @@
version: "3.8"
services:
nginx:
container_name: nginx
build:
context: ./nginx
dockerfile: Dockerfile
ports:
- 80:80
depends_on:
- plane-web
- plane-api
db:
image: postgres:15.2-alpine
container_name: db
restart: always
volumes:
- pgdata:/var/lib/postgresql/data
environment:
POSTGRES_USER: plane
POSTGRES_DB: plane
POSTGRES_PASSWORD: xyzzyspoon
PGDATA: /var/lib/postgresql/data
command: postgres -c 'max_connections=1000'
ports:
- 5432:5432
redis:
image: redis:6.2.7-alpine
container_name: redis
restart: always
ports:
- 6379:6379
volumes:
- redisdata:/data
plane-web:
container_name: planefrontend
image: makeplane/plane-frontend:latest
restart: always
command: node apps/app/server.js
env_file:
- ./apps/app/.env
ports:
- 3000:3000
plane-api:
container_name: planebackend
image: makeplane/plane-backend:latest
build:
context: ./apiserver
dockerfile: Dockerfile.api
restart: always
ports:
- 8000:8000
env_file:
- ./apiserver/.env
depends_on:
- db
- redis
command: ./bin/takeoff
links:
- db:db
- redis:redis
plane-worker:
container_name: planerqworker
image: makeplane/plane-worker:latest
depends_on:
- redis
- db
- plane-api
command: ./bin/worker
links:
- redis:redis
- db:db
env_file:
- ./apiserver/.env
volumes:
pgdata:
redisdata: