diff --git a/backend/main/server/app.go b/backend/main/server/app.go index 3b1294462..f4a9dec08 100644 --- a/backend/main/server/app.go +++ b/backend/main/server/app.go @@ -116,7 +116,6 @@ func (a *App) Initialize() { // when running "make proposals" sets db to dev not test arg := flag.String("db", "", "database type") - flag.Bool("ipfs-override", true, "overrides ipfs call") flag.Int("port", 5001, "port") flag.Int("amount", 4, "Amount of proposals to create") @@ -127,10 +126,20 @@ func (a *App) Initialize() { // Postgres dbname := os.Getenv("DB_NAME") + + // IPFS + if os.Getenv("APP_ENV") == "TEST" || os.Getenv("APP_ENV") == "DEV" { + flag.Bool("ipfs-override", true, "overrides ipfs call") + } else { + flag.Bool("ipfs-override", false, "overrides ipfs call") + } + + // TEST Env if os.Getenv("APP_ENV") == "TEST" { dbname = os.Getenv("TEST_DB_NAME") } + // Postgres a.ConnectDB( os.Getenv("DB_USERNAME"), os.Getenv("DB_PASSWORD"), diff --git a/backend/migrations/000041_increase_vote_message_max_length.down.sql b/backend/migrations/000041_increase_vote_message_max_length.down.sql new file mode 100644 index 000000000..91ca60f88 --- /dev/null +++ b/backend/migrations/000041_increase_vote_message_max_length.down.sql @@ -0,0 +1 @@ +-- no going back! \ No newline at end of file diff --git a/backend/migrations/000041_increase_vote_message_max_length.up.sql b/backend/migrations/000041_increase_vote_message_max_length.up.sql new file mode 100644 index 000000000..397527d5b --- /dev/null +++ b/backend/migrations/000041_increase_vote_message_max_length.up.sql @@ -0,0 +1 @@ +ALTER TABLE votes ALTER COLUMN message TYPE TEXT; \ No newline at end of file diff --git a/frontend/packages/client/src/App.js b/frontend/packages/client/src/App.js index 0dab3c38c..7cd3680fe 100644 --- a/frontend/packages/client/src/App.js +++ b/frontend/packages/client/src/App.js @@ -5,6 +5,7 @@ import { HashRouter as Router } from 'react-router-dom'; import NotificationModalProvider from 'contexts/NotificationModal'; import { Web3Provider } from 'contexts/Web3'; import { ErrorHandler } from 'components'; +import { IS_PRODUCTION } from 'const'; import Hotjar from '@hotjar/browser'; import { QueryClient, QueryClientProvider } from '@tanstack/react-query'; import { ReactQueryDevtools } from '@tanstack/react-query-devtools'; @@ -36,7 +37,7 @@ function App() { - + {!IS_PRODUCTION && } ); diff --git a/frontend/packages/client/src/const/index.js b/frontend/packages/client/src/const/index.js index dae31049b..e7d5a7fc2 100644 --- a/frontend/packages/client/src/const/index.js +++ b/frontend/packages/client/src/const/index.js @@ -14,6 +14,9 @@ export const COMMUNITY_DESCRIPTION_MAX_LENGTH = 1000; export const HAS_DELAY_ON_START_TIME = process.env.REACT_APP_APP_ENV?.toUpperCase() === 'PRODUCTION'; +export const IS_PRODUCTION = + process.env.REACT_APP_APP_ENV?.toUpperCase() === 'PRODUCTION'; + export const FilterValues = { all: 'All', active: 'Active',