-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #73 from Vizzuality/staging
merge
- Loading branch information
Showing
295 changed files
with
50,341 additions
and
5,482 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,6 @@ | ||
NEXT_PUBLIC_URL=http://localhost:$PORT | ||
NEXT_PUBLIC_API_URL=http://0.0.0.0:1337/cms | ||
NEXT_PUBLIC_API_URL=http://0.0.0.0:1337/api | ||
NEXT_PUBLIC_CMS_URL=http://0.0.0.0:1337 | ||
NEXT_PUBLIC_GA_TRACKING_ID=UA-000000-01 | ||
NEXT_PUBLIC_MAPBOX_API_TOKEN=your-token-here | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,4 @@ | ||
/.next | ||
/node_modules | ||
/public | ||
/public | ||
/src/types/generated |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
#!/bin/bash | ||
. "$(dirname -- "$0")/_/husky.sh" | ||
|
||
SCRIPT_DIR="$(pwd)" | ||
CMS_ENV_FILE="$SCRIPT_DIR/cms/.env" | ||
echo $CMS_ENV_FILE | ||
if [ -f "$CMS_ENV_FILE" ] ; then | ||
echo "Importing CMS config.." | ||
cd ./cms && yarn config-sync import -y | ||
else | ||
echo "CMS env file does not exist, can't import config" | ||
echo "DEBUG: looking for env file in $CMS_ENV_FILE" | ||
fi |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,29 @@ | ||
#!/usr/bin/env sh | ||
. "$(dirname -- "$0")/_/husky.sh" | ||
|
||
# If client yarn.lock has changed, run yarn to install dependencies | ||
CLIENT_CHANGED=`git diff HEAD@{1} --stat -- ./client/yarn.lock | wc -l` | ||
if [ "$CLIENT_CHANGED" -gt 0 ]; | ||
then | ||
echo "client/yarn.lock has changed!" | ||
cd ./client && yarn | ||
fi | ||
|
||
# If CMS yarn.lock has changed, run yarn to install dependencies | ||
CMS_CHANGED=`git diff HEAD@{1} --stat -- ./cms/yarn.lock | wc -l` | ||
if [ "$CMS_CHANGED" -gt 0 ]; | ||
then | ||
echo "cms/yarn.lock has changed!" | ||
cd ./cms && yarn | ||
fi | ||
|
||
# If CMS env file exists and there are changes to the config sync files, import them into the DB | ||
CMS_CONFIG_CHANGED=`git diff HEAD@{1} --stat -- ./cms/config/sync/ | wc -l` | ||
SCRIPT_DIR="$(pwd)" | ||
CMS_ENV_FILE="$SCRIPT_DIR/../cms/.env" | ||
if [[ ! -f "$CMS_ENV_FILE" ]] ; then | ||
echo "CMS env file does not exist, can't import config." | ||
elif [[ -f "$CMS_ENV_FILE" && "$CMS_CONFIG_CHANGED" -gt 0 ]]; then | ||
echo "Importing CMS config..." | ||
cd ./cms && yarn config-sync import -y | ||
fi |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
import { dehydrate } from "@tanstack/react-query"; | ||
import { Hydrate } from "@tanstack/react-query"; | ||
|
||
import getQueryClient from "@/lib/react-query/getQueryClient"; | ||
|
||
import Footer from "@/containers/footer"; | ||
import Header from "@/containers/header"; | ||
|
||
export default async function AuthLayout({ children }: { children: React.ReactNode }) { | ||
const queryClient = getQueryClient(); | ||
|
||
const dehydratedState = dehydrate(queryClient); | ||
|
||
return ( | ||
<Hydrate state={dehydratedState}> | ||
<main className="h-[100svh] w-full divide-y-2 divide-gray-300/20"> | ||
<Header /> | ||
<section className="flex grow flex-col items-center justify-center">{children}</section> | ||
<Footer /> | ||
</main> | ||
</Hydrate> | ||
); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
import { Metadata } from "next"; | ||
|
||
import Signin from "@/components/forms/signin"; | ||
|
||
export const metadata: Metadata = { | ||
title: "Sign in | Caribbean Climate smart map", | ||
description: "Generated by create next app", | ||
}; | ||
|
||
export default function SigninPage() { | ||
return ( | ||
<> | ||
<h1 className="py-10 text-3xl font-bold -tracking-[0.0375rem]">Log in</h1> | ||
<Signin /> | ||
</> | ||
); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
import { Metadata } from "next"; | ||
|
||
import Signup from "@/components/forms/signup"; | ||
|
||
export const metadata: Metadata = { | ||
title: "Sign up | Caribbean Climate smart map", | ||
description: "Caribbean Climate smart map", | ||
}; | ||
|
||
export default function SignupPage() { | ||
return ( | ||
<> | ||
<h1 className="py-10 text-3xl font-bold -tracking-[0.0375rem]">Sign up</h1> | ||
<Signup /> | ||
</> | ||
); | ||
} |
16 changes: 16 additions & 0 deletions
16
client/src/app/(dashboard)/dashboard/(profile)/[[...id]]/page.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
import { Metadata } from "next"; | ||
|
||
import DashboardContent from "@/containers/dashboard"; | ||
|
||
export const metadata: Metadata = { | ||
title: "Dashboard | Caribbean Climate smart map", | ||
description: "Generated by create next app", | ||
}; | ||
|
||
export default function DashboardPage() { | ||
return ( | ||
<div className="w-full"> | ||
<DashboardContent /> | ||
</div> | ||
); | ||
} |
Oops, something went wrong.