Admin pages

.devcontainer/devcontainer.json

@@ -0,0 +1 @@
+{"image":"mcr.microsoft.com/devcontainers/universal:2"}

.gitignore

@@ -186,4 +186,6 @@ server/server
 *.db
 dist/
 
-*.sqlite
+*.sqlite
+
+setupConfig.sh

README.md

@@ -37,3 +37,4 @@ Once the application is up and running you should be able to access it using the
 
 - Create config file with name config (and extension .env, .yml, .json) in `server/`, `api/` and `templates/` add config variables (for eg see config.env.example in each folder)
 - Create a `.env` file inside companion folder in root for companion config variables (for eg see .env.example file in companion folder)
+git fetch upstream

build.sh

@@ -0,0 +1,55 @@
+ROOT_CONFIG_ENV=config.env
+KAVACH_CONFIG_ENV=kavach-config.env
+COMPANION_ENV=companion/.env
+API_CONFIG=api/config.env
+SERVER_CONFIG=server/config.env
+TEMPLATE_CONFIG=templates/config.env
+
+
+# Copy config/config.env.example to config.env if it does not exist
+if [ -f "$ROOT_CONFIG_ENV" ]; then
+    echo "Skipping copying config/config.env. File exists already."
+else
+    cp config.env.example config.env
+    echo "Copied config.env.example to config.env."
+fi
+
+# Copy config/kavach-config.env.example to kavach-config.env if it does not exist
+if [ -f "$KAVACH_CONFIG_ENV" ]; then
+		echo "Skipping copying config/kavach-config.env. File exists already."
+else
+		cp kavach-config.env.example kavach-config.env
+		echo "Copied config/kavach-config.env.example to kavach-config.env."
+fi
+
+# Copy companion/.env.example to companion/.env if it does not exist
+if [ -f "$COMPANION_ENV" ]; then
+		echo "Skipping copying companion/.env. File exists already."
+else
+		cp companion/.env.example companion/.env
+		echo "Copied companion/.env.example to companion/.env."
+fi
+
+# Copy api/config.env.example to api/config.env if it does not exist
+if [ -f "$API_CONFIG" ]; then
+		echo "Skipping copying api/config.env. File exists already."
+else
+		cp api/config.env.example api/config.env
+		echo "Copied api/config.env.example to api/config.env."
+fi
+
+# Copy server/config.env.example to server/config.env if it does not exist
+if [ -f "$SERVER_CONFIG" ]; then
+		echo "Skipping copying server/config.env. File exists already."
+else
+		cp server/config.env.example server/config.env
+		echo "Copied server/config.env.example to server/config.env."
+fi
+
+# Copy template/config.env.example to template/config.env if it does not exist
+if [ -f "$TEMPLATE_CONFIG" ]; then
+		echo "Skipping copying templates/config.env. File exists already."
+else
+		cp templates/config.env.example templates/config.env
+		echo "Copied templates/config.env.example to templates/config.env."
+fi

docker-compose.yml

@@ -165,7 +165,7 @@ services:
     image: oryd/keto:v0.9.0-alpha.0
     ports:
       - "4466:4466" # read
-      - "4467:4467" # write 
+      - "4467:4467" # write
       - "4468:4468" # metric
     environment:
       - LOG_LEVEL=debug
@@ -253,7 +253,7 @@ services:
       - KAVACH_KETO_READ_API_URL=http://keto:4466
       - KAVACH_KETO_WRITE_API_URL=http://keto:4467
       - KAVACH_KRATOS_ADMIN_URL=http://kratos:4434
-      - KAVACH_KRATOS_PUBLIC_URL=http://kratos:4433 
+      - KAVACH_KRATOS_PUBLIC_URL=http://kratos:4433
       - KAVACH_MODE=development
       - KAVACH_USE_SQLITE=false
       - KAVACH_SQLITE_DB_PATH=kavach.db
@@ -263,7 +263,7 @@ services:
       - KAVACH_MANDE_HOST=http://mande.factly.in
       - KAVACH_DYNAMIC_MANDE_TEMPLATE_ID=1
       - KAVACH_DYNAMIC_SENDGRID_API_KEY=SENDGRID_API_KEY
-      - KAVACH_ENABLE_MULTITENANCY=false
+      - KAVACH_ENABLE_MULTITENANCY=true
       - KAVACH_DISABLE_REGISTRATION=false
       - KAVACH_APPLICATION_NAME=Kavach
       - KAVACH_DEFAULT_USER_EMAIL=dega@newchecker.in
@@ -297,7 +297,7 @@ services:
       - KAVACH_KETO_READ_API_URL=http://keto:4466
       - KAVACH_KETO_WRITE_API_URL=http://keto:4467
       - KAVACH_KRATOS_ADMIN_URL=http://kratos:4434
-      - KAVACH_KRATOS_PUBLIC_URL=http://kratos:4433 
+      - KAVACH_KRATOS_PUBLIC_URL=http://kratos:4433
       - KAVACH_MODE=development
       - KAVACH_USE_SQLITE=false
       - KAVACH_SQLITE_DB_PATH=kavach.db
@@ -328,17 +328,17 @@ services:
         target: /app/public/config.js
 
     environment:
-      - PUBLIC_URL=http://127.0.0.1:4455/.factly/kavach/web 
+      - PUBLIC_URL=http://127.0.0.1:4455/.factly/kavach/web
       - REACT_APP_PUBLIC_URL='http://127.0.0.1:4455/.factly/kavach/web';
       - REACT_APP_KAVACH_TITLE='FACTLY';
       - REACT_APP_COMPANION_URL='http://127.0.0.1:3020';
       - REACT_APP_API_URL='http://127.0.0.1:4455/.factly/kavach/server';
       - REACT_APP_KRATOS_PUBLIC_URL='http://127.0.0.1:4455/.ory/kratos/public';
-      - REACT_APP_ENABLE_MULTITENANCY='false';
+      - REACT_APP_ENABLE_MULTITENANCY='true';
       - REACT_APP_DISABLE_REGISTRATION=false;
       - REACT_APP_REDIRECT_SINGLE_APPLICATION_USERS=true;
       - REACT_APP_LOGO_URL='https://images.factly.in/login/applications/logos/factly.png?rs:fill/h:60';
-      - REACT_APP_ENABLE_IMGPROXY=false; 
+      - REACT_APP_ENABLE_IMGPROXY=false;
     restart: unless-stopped
     networks:
       - dega

server/config.env.example

@@ -3,7 +3,7 @@ MODE=development
 # dependencies services
 KAVACH_URL=http://kavach-server:8000
 IMAGEPROXY_URL=http://127.0.0.1:7001
-KETO_URL=http://keto:4466
+KETO_READ_API_URL=http://keto:4466
 NATS_URL=http://nats:4222
 KRATOS_PUBLIC_URL=http://kratos:4433
 IFRAMELY_URL=http://iframely:8061
@@ -12,11 +12,11 @@ OATHKEEPER_HOST=oathkeeper:4455
 GOOGLE_KEY=GOOGLE_KEY       # for google fact checks search
 
 # database params
-DATABASE_HOST=postgres 
+DATABASE_HOST=postgres
 DATABASE_USER=postgres
 DATABASE_PASSWORD=postgres
-DATABASE_NAME=dega 
-DATABASE_PORT=5432 
+DATABASE_NAME=dega
+DATABASE_PORT=5432
 DATABASE_SSL_MODE=disable
 
 # set this to true if want to use sqlite db
@@ -43,4 +43,4 @@ NATS_USER_NAME=natsuser
 NATS_USER_PASSWORD=natspassword
 HUKZ_URL=http://hukz:8000
 
-ORGANISATION_PERMISSION_ENABLED=false
+ORGANISATION_PERMISSION_ENABLED=false