Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
105 commits
Select commit Hold shift + click to select a range
3fe5eb9
Merge pull request #130 from DapperCollectives/staging
fersan1985 Jul 12, 2022
e90c8cf
Merge pull request #181 from DapperCollectives/staging
fersan1985 Jul 18, 2022
74bb496
Merge pull request #183 from DapperCollectives/staging
fersan1985 Jul 18, 2022
4fda87f
Merge pull request #184 from DapperCollectives/staging
fersan1985 Jul 18, 2022
6e2f1aa
Merge pull request #187 from DapperCollectives/staging
dbslone Jul 19, 2022
c3dcf99
Merge pull request #190 from DapperCollectives/staging
fersan1985 Jul 19, 2022
6492d83
Merge pull request #201 from DapperCollectives/staging
fersan1985 Jul 20, 2022
bae8a34
Merge pull request #210 from DapperCollectives/main
dbslone Jul 21, 2022
968e9fb
Merge pull request #212 from DapperCollectives/main
dbslone Jul 21, 2022
dd7188e
Merge pull request #214 from DapperCollectives/main
dbslone Jul 21, 2022
5774ff3
Merge pull request #224 from DapperCollectives/main
dbslone Jul 22, 2022
1291eaa
Merge pull request #226 from DapperCollectives/main
dbslone Jul 22, 2022
762cf57
Merge pull request #228 from DapperCollectives/main
dbslone Jul 22, 2022
a37633f
Merge pull request #236 from DapperCollectives/main
dbslone Jul 22, 2022
28e0091
Merge pull request #241 from DapperCollectives/main
fersan1985 Jul 22, 2022
f007122
Merge pull request #243 from DapperCollectives/main
fersan1985 Jul 22, 2022
508ceec
Added the port (#244) (#245)
fersan1985 Jul 22, 2022
7cd8498
Merge pull request #252 from DapperCollectives/main
dbslone Jul 22, 2022
0cc4f4f
Merge pull request #254 from DapperCollectives/main
dbslone Jul 22, 2022
e31b6d4
Merge pull request #255 from DapperCollectives/main
dbslone Jul 22, 2022
d7e71ed
Merge pull request #256 from DapperCollectives/main
dbslone Jul 23, 2022
2ed06e0
Merge pull request #258 from DapperCollectives/main
dbslone Jul 23, 2022
a163d9a
Merge pull request #260 from DapperCollectives/main
dbslone Jul 24, 2022
66e7f83
Merge pull request #266 from DapperCollectives/main
dbslone Jul 25, 2022
06400e3
Merge pull request #268 from DapperCollectives/main
dbslone Jul 25, 2022
7535852
Merge pull request #270 from DapperCollectives/main
dbslone Jul 25, 2022
bacbac8
Merge pull request #273 from DapperCollectives/main
dbslone Jul 25, 2022
b36c2b6
Merge pull request #277 from DapperCollectives/main
dbslone Jul 25, 2022
47092c1
Merge pull request #280 from DapperCollectives/main
dbslone Jul 25, 2022
761ef36
Merge pull request #283 from DapperCollectives/main
dbslone Jul 25, 2022
8933f94
Merge pull request #286 from DapperCollectives/main
dbslone Jul 26, 2022
f15b8ff
Merge pull request #289 from DapperCollectives/main
dbslone Jul 26, 2022
0eba344
Merge pull request #296 from DapperCollectives/main
dbslone Jul 26, 2022
81bbae4
Merge pull request #299 from DapperCollectives/main
dbslone Jul 26, 2022
2857337
Merge pull request #302 from DapperCollectives/main
dbslone Jul 26, 2022
419dd90
Merge pull request #305 from DapperCollectives/main
dbslone Jul 26, 2022
77e5b06
Merge pull request #308 from DapperCollectives/main
dbslone Jul 27, 2022
cb245b2
Staging -> Production
dbslone Jul 27, 2022
041c9ba
Merge pull request #312 from DapperCollectives/main
dbslone Jul 27, 2022
ae0b531
Merge pull request #316 from DapperCollectives/main
dbslone Jul 27, 2022
73c9a8b
Merge pull request #321 from DapperCollectives/main
dbslone Jul 28, 2022
bcb6274
Merge pull request #325 from DapperCollectives/main
dbslone Aug 1, 2022
6a41ab9
Nginx change (#329) (#330)
fersan1985 Aug 2, 2022
e0a3e82
Merge pull request #333 from DapperCollectives/main
dbslone Aug 3, 2022
0f6dc09
Merge pull request #336 from DapperCollectives/main
dbslone Aug 8, 2022
7018957
Release 1.1.0
dbslone Aug 8, 2022
962e825
Merge pull request #341 from DapperCollectives/main
dbslone Aug 8, 2022
0ea0d40
Merge pull request #342 from DapperCollectives/main
dbslone Aug 8, 2022
3c31c91
Merge pull request #343 from DapperCollectives/main
dbslone Aug 8, 2022
55f8bdc
Merge pull request #348 from DapperCollectives/main
dbslone Aug 9, 2022
6767844
Merge pull request #352 from DapperCollectives/main
dbslone Aug 10, 2022
4f61acb
Merge pull request #359 from DapperCollectives/main
dbslone Aug 11, 2022
dc6f683
Merge pull request #366 from DapperCollectives/main
dbslone Aug 15, 2022
8588723
Merge pull request #369 from DapperCollectives/main
dbslone Aug 16, 2022
afa0087
Merge pull request #374 from DapperCollectives/main
dbslone Aug 16, 2022
1b13afe
Merge pull request #383 from DapperCollectives/main
dbslone Aug 22, 2022
9b38018
Merge pull request #385 from DapperCollectives/main
dbslone Aug 22, 2022
c815113
Merge pull request #387 from DapperCollectives/main
dbslone Aug 22, 2022
9e54e02
Merge pull request #389 from DapperCollectives/main
dbslone Aug 22, 2022
7b8533e
Merge pull request #391 from DapperCollectives/main
dbslone Aug 22, 2022
19b1e74
Release 1.2.0
dbslone Aug 22, 2022
b613521
fix latest tag
dbslone Aug 22, 2022
cc43f88
Merge pull request #396 from DapperCollectives/dbslone/hotfix-2-tag
dbslone Aug 22, 2022
1b61f2f
Merge pull request #397 from DapperCollectives/main
dbslone Aug 22, 2022
682475b
Merge pull request #399 from DapperCollectives/main
dbslone Aug 22, 2022
74cdbf2
Merge pull request #405 from DapperCollectives/main
dbslone Aug 24, 2022
81c75a1
Merge pull request #412 from DapperCollectives/main
jbluks Aug 25, 2022
d019679
Merge pull request #415 from DapperCollectives/main
dbslone Aug 26, 2022
70273b0
Merge pull request #416 from DapperCollectives/main
jbluks Aug 26, 2022
73cb063
Merge pull request #418 from DapperCollectives/main
jbluks Aug 26, 2022
698cc53
Merge pull request #421 from DapperCollectives/main
jbluks Aug 29, 2022
573d5ed
Merge branch 'prod-gcp' into staging
jbluks Aug 30, 2022
99c3b4b
Merge pull request #423 from DapperCollectives/staging
jbluks Aug 30, 2022
183e97d
Merge pull request #438 from DapperCollectives/main
jbluks Sep 12, 2022
83b251a
Merge pull request #440 from DapperCollectives/main
jbluks Sep 12, 2022
4b85d53
Merge pull request #442 from DapperCollectives/main
jbluks Sep 12, 2022
eb31494
Merge pull request #448 from DapperCollectives/main
jbluks Sep 13, 2022
9b69de4
Merge pull request #456 from DapperCollectives/main
jbluks Sep 14, 2022
89e14ff
Merge pull request #459 from DapperCollectives/main
jbluks Sep 14, 2022
fd3b77c
Merge pull request #461 from DapperCollectives/main
jbluks Sep 14, 2022
83485ab
Merge pull request #465 from DapperCollectives/main
jbluks Sep 14, 2022
16eb07d
Merge pull request #467 from DapperCollectives/main
jbluks Sep 14, 2022
8b1906c
Merge pull request #468 from DapperCollectives/main
jbluks Sep 14, 2022
fd60183
Merge pull request #477 from DapperCollectives/main
jbluks Sep 15, 2022
85dcb50
Merge pull request #478 from DapperCollectives/main
jbluks Sep 15, 2022
9178d4f
Merge pull request #497 from DapperCollectives/main
jbluks Sep 16, 2022
ab8d6da
Main -> Staging (#500)
jbluks Sep 19, 2022
7adefcb
Merge pull request #502 from DapperCollectives/main
jbluks Sep 19, 2022
71b4f3d
Merge pull request #505 from DapperCollectives/main
jbluks Sep 19, 2022
c3d8257
Merge pull request #507 from DapperCollectives/main
jbluks Sep 19, 2022
ae9565e
Merge pull request #508 from DapperCollectives/staging
jbluks Sep 19, 2022
3ca1949
hide react-query icon
germanurrus Sep 20, 2022
34d4712
Merge pull request #511 from DapperCollectives/hotfix-cas-553
jbluks Sep 20, 2022
7f581dc
only set to in DEV and TEST environments
jacksonConrad Sep 21, 2022
e25cd27
Merge pull request #518 from DapperCollectives/jackson/CAS-562
dbslone Sep 21, 2022
514a70a
adds migration to increase vote message max length
jacksonConrad Sep 21, 2022
287c735
Merge branch 'prod-gcp' into hotfix/CAS-563
jacksonConrad Sep 21, 2022
b118990
fix migration order
jacksonConrad Sep 21, 2022
0b13d3b
remove duplicate flag.Bool call
jacksonConrad Sep 21, 2022
95cb4ed
only call flag.Bool('ipfs-override') once
jacksonConrad Sep 21, 2022
5fe22e8
change votes.message column to TEXT instead of VARCHAR
jacksonConrad Sep 21, 2022
6e79597
Merge pull request #520 from DapperCollectives/hotfix/ipfs-override
dbslone Sep 21, 2022
c99e7c9
Merge pull request #519 from DapperCollectives/hotfix/CAS-563
jbluks Sep 21, 2022
a8bbeac
Merge branch 'main' of https://github.com/DapperCollectives/CAST into…
jbluks Sep 21, 2022
d88d073
Merge branch 'prod-gcp' of https://github.com/DapperCollectives/CAST …
jbluks Sep 21, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion backend/main/server/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -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")

Expand All @@ -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"),
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
-- no going back!
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ALTER TABLE votes ALTER COLUMN message TYPE TEXT;
3 changes: 2 additions & 1 deletion frontend/packages/client/src/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -36,7 +37,7 @@ function App() {
</Router>
</NotificationModalProvider>
</Web3Provider>
<ReactQueryDevtools initialIsOpen={false} />
{!IS_PRODUCTION && <ReactQueryDevtools initialIsOpen={false} />}
</QueryClientProvider>
</ErrorBoundary>
);
Expand Down
3 changes: 3 additions & 0 deletions frontend/packages/client/src/const/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down