Merge branch 'develop' of github.com:Open-Earth-Foundation/CityCataly…

…st into feature/manual-input

app/.eslintrc

@@ -1,6 +1,6 @@
 {
-    "extends": "next",
-    "rules": {
-      "react/no-unescaped-entities": "off"
-    }
+  "extends": "next",
+  "rules": {
+    "react/no-unescaped-entities": "off"
+  }
 }

app/.eslintrc.json

@@ -1,6 +1,3 @@
 {
-  "extends": [
-    "next/core-web-vitals",
-    "plugin:storybook/recommended"
-  ]
+  "extends": ["next/core-web-vitals", "plugin:storybook/recommended"]
 }

app/.prettierignore

@@ -0,0 +1,5 @@
+# Ignore artifacts:
+build
+coverage
+node_modules
+.next

app/.prettierrc.json

@@ -0,0 +1,3 @@
+{
+  "semi": true
+}

app/.storybook/preview.ts

@@ -1,6 +1,6 @@
 import type { Preview } from "@storybook/react";
 
-import '../src/app/globals.css';
+import "../src/app/globals.css";
 
 const preview: Preview = {
   parameters: {

app/README.md

@@ -33,6 +33,7 @@ createuser citycatalyst
 ```
 
 Then, create the database
+
 ```bash
 createdb citycatalyst -O citycatalyst
 ```

app/config/config.cjs

@@ -1,26 +1,26 @@
-const conf = require('dotenv/config');
+const conf = require("dotenv/config");
 
 module.exports = {
-  "development": {
-    "username": process.env.DATABASE_USER,
-    "password": process.env.DATABASE_PASSWORD || null,
-    "database": process.env.DATABASE_NAME,
-    "host": process.env.DATABASE_HOST,
-    "dialect": "postgres",
-    "logging": true
+  development: {
+    username: process.env.DATABASE_USER,
+    password: process.env.DATABASE_PASSWORD || null,
+    database: process.env.DATABASE_NAME,
+    host: process.env.DATABASE_HOST,
+    dialect: "postgres",
+    logging: true,
   },
-  "test": {
-    "username": process.env.DATABASE_USER,
-    "password": process.env.DATABASE_PASSWORD || null,
-    "database": process.env.DATABASE_NAME,
-    "host": process.env.DATABASE_HOST,
-    "dialect": "postgres"
+  test: {
+    username: process.env.DATABASE_USER,
+    password: process.env.DATABASE_PASSWORD || null,
+    database: process.env.DATABASE_NAME,
+    host: process.env.DATABASE_HOST,
+    dialect: "postgres",
   },
-  "production": {
-    "username": process.env.DATABASE_USER,
-    "password": process.env.DATABASE_PASSWORD || null,
-    "database": process.env.DATABASE_NAME,
-    "host": process.env.DATABASE_HOST,
-    "dialect": "postgres"
-  }
-}
+  production: {
+    username: process.env.DATABASE_USER,
+    password: process.env.DATABASE_PASSWORD || null,
+    database: process.env.DATABASE_NAME,
+    host: process.env.DATABASE_HOST,
+    dialect: "postgres",
+  },
+};

app/cypress.config.ts

@@ -4,10 +4,9 @@ export default defineConfig({
   video: false,
   screenshotOnRunFailure: false,
   e2e: {
-    baseUrl: 'http://localhost:3000',
+    baseUrl: "http://localhost:3000",
     setupNodeEvents(on, config) {
       // implement node event listeners here
     },
   },
 });
-

app/cypress/e2e/login.cy.ts

@@ -1,26 +1,25 @@
-describe('Login page', () => {
-  it('redirects to dashboard after entering correct data', () => {
-    cy.visit('/login')
-    cy.contains('Log In')
-    cy.get('input[name="email"]').type('test@openearth.org')
-    cy.get('input[name="password"]').type('password')
-    cy.get('button[type="submit"]').click()
+describe("Login page", () => {
+  it("redirects to dashboard after entering correct data", () => {
+    cy.visit("/login");
+    cy.contains("Log In");
+    cy.get('input[name="email"]').type("test@openearth.org");
+    cy.get('input[name="password"]').type("password");
+    cy.get('button[type="submit"]').click();
 
-    cy.url().should('equal', Cypress.config().baseUrl + '/en')
-    cy.contains('Welcome Back,')
-  })
+    cy.url().should("equal", Cypress.config().baseUrl + "/en");
+    cy.contains("Welcome Back,");
+  });
 
-  it('shows errors when entering invalid data', () => {
-    cy.visit('/login')
-    cy.contains('Log In')
+  it("shows errors when entering invalid data", () => {
+    cy.visit("/login");
+    cy.contains("Log In");
 
-    cy.get('input[name="email"]').type('testopenearthorg')
-    cy.get('input[name="password"]').type('pas')
-    cy.get('button[type="submit"]').click()
-
-    cy.url().should('equal', Cypress.config().baseUrl + '/en/login')
-    cy.contains('valid email address')
-    cy.contains('Minimum length')
-  })
-})
+    cy.get('input[name="email"]').type("testopenearthorg");
+    cy.get('input[name="password"]').type("pas");
+    cy.get('button[type="submit"]').click();
 
+    cy.url().should("equal", Cypress.config().baseUrl + "/en/login");
+    cy.contains("valid email address");
+    cy.contains("Minimum length");
+  });
+});

app/cypress/e2e/signup.cy.ts

@@ -1,49 +1,52 @@
-describe('Signup page', () => {
-  it('redirects to dashboard after entering correct data', () => {
-    cy.visit('/signup')
-    cy.contains('Sign Up')
-    cy.get('input[name="name"]').type('Test Account')
-    cy.get('input[name="email"]').type('test@openearth.org')
-    cy.get('input[name="password"]').type('Password1')
-    cy.get('input[name="confirmPassword"]').type('Password1')
-    cy.get('input[name="inviteCode"]').type('ABCDEF')
-    cy.get('input[name="acceptTerms"]').siblings('.chakra-checkbox__control').click()
-    cy.get('button[type="submit"]').click()
+describe("Signup page", () => {
+  it("redirects to dashboard after entering correct data", () => {
+    cy.visit("/signup");
+    cy.contains("Sign Up");
+    cy.get('input[name="name"]').type("Test Account");
+    cy.get('input[name="email"]').type("test@openearth.org");
+    cy.get('input[name="password"]').type("Password1");
+    cy.get('input[name="confirmPassword"]').type("Password1");
+    cy.get('input[name="inviteCode"]').type("ABCDEF");
+    cy.get('input[name="acceptTerms"]')
+      .siblings(".chakra-checkbox__control")
+      .click();
+    cy.get('button[type="submit"]').click();
 
-    cy.url().should('contain', '/check-email')
-    cy.contains('Check Your Email')
-  })
+    cy.url().should("contain", "/check-email");
+    cy.contains("Check Your Email");
+  });
 
-  it('shows errors when entering invalid data', () => {
-    cy.visit('/signup')
-    cy.contains('Sign Up')
-    cy.get('input[name="name"]').type('asd')
-    cy.get('input[name="email"]').type('testopenearthorg')
-    cy.get('input[name="password"]').type('Pas')
-    cy.get('input[name="confirmPassword"]').type('Pa1')
-    cy.get('input[name="inviteCode"]').type('ABCDE')
-    cy.get('button[type="submit"]').click()
+  it("shows errors when entering invalid data", () => {
+    cy.visit("/signup");
+    cy.contains("Sign Up");
+    cy.get('input[name="name"]').type("asd");
+    cy.get('input[name="email"]').type("testopenearthorg");
+    cy.get('input[name="password"]').type("Pas");
+    cy.get('input[name="confirmPassword"]').type("Pa1");
+    cy.get('input[name="inviteCode"]').type("ABCDE");
+    cy.get('button[type="submit"]').click();
 
-    cy.url().should('contain', '/signup')
-    cy.contains('valid email address')
-    cy.contains('Minimum length')
-    cy.contains('Invalid invite code')
-    cy.contains('Please accept the terms')
-  })
+    cy.url().should("contain", "/signup");
+    cy.contains("valid email address");
+    cy.contains("Minimum length");
+    cy.contains("Invalid invite code");
+    cy.contains("Please accept the terms");
+  });
 
-  it('should require matching passwords', () => {
-    cy.visit('/signup')
-    cy.contains('Sign Up')
-    cy.get('input[name="name"]').type('Test Account')
-    cy.get('input[name="email"]').type('test@openearth.org')
-    cy.get('input[name="password"]').type('Password1')
-    cy.get('input[name="confirmPassword"]').type('Password2')
-    cy.get('input[name="inviteCode"]').type('ABCDEF')
-    cy.get('input[name="acceptTerms"]').siblings('.chakra-checkbox__control').click()
-    cy.get('button[type="submit"]').click()
-
-    cy.url().should('contain', '/signup')
-    cy.contains('Passwords don\'t match')
-  })
-})
+  it("should require matching passwords", () => {
+    cy.visit("/signup");
+    cy.contains("Sign Up");
+    cy.get('input[name="name"]').type("Test Account");
+    cy.get('input[name="email"]').type("test@openearth.org");
+    cy.get('input[name="password"]').type("Password1");
+    cy.get('input[name="confirmPassword"]').type("Password2");
+    cy.get('input[name="inviteCode"]').type("ABCDEF");
+    cy.get('input[name="acceptTerms"]')
+      .siblings(".chakra-checkbox__control")
+      .click();
+    cy.get('button[type="submit"]').click();
 
+    cy.url().should("contain", "/signup");
+    cy.contains("Passwords don't match");
+  });
+});

app/cypress/support/commands.ts

@@ -34,4 +34,4 @@
 //       visit(originalFn: CommandOriginalFn, url: string, options: Partial<VisitOptions>): Chainable<Element>
 //     }
 //   }
-// }
+// }

app/cypress/support/e2e.ts

@@ -14,7 +14,7 @@
 // ***********************************************************
 
 // Import commands.js using ES2015 syntax:
-import './commands'
+import "./commands";
 
 // Alternatively you can use CommonJS syntax:
-// require('./commands')
+// require('./commands')

app/migrations/20230728183114-Init.cjs

@@ -1,4 +1,4 @@
-'use strict';
+"use strict";
 
 /** @type {import('sequelize-cli').Migration} */
 module.exports = {
@@ -475,21 +475,44 @@ module.exports = {
 
   async down(queryInterface) {
     const tables = [
-      'User', 'City', 'CityUser', 'Publisher', 'ReportingLevel', 'Scope',
-      'Sector', 'SubSector', 'SubCategory', 'ActivityData', 'EmissionsFactor',
-      'GHGs', 'DataSource', 'Methodology', 'DataSourceActivityData',
-      'DataSourceEmissionsFactor', 'DataSourceGHGs', 'DataSourceMethodology',
-      'DataSourceReportingLevel', 'DataSourceScope', 'DataSourceSector',
-      'DataSourceSubCategory', 'DataSourceSubSector', 'GDP', 'Inventory',
-      'Population', 'SectorValue', 'SubCategoryValue',
-      'SubSectorReportingLevel', 'SubSectorScope', 'SubSectorValue', 'Version'
+      "User",
+      "City",
+      "CityUser",
+      "Publisher",
+      "ReportingLevel",
+      "Scope",
+      "Sector",
+      "SubSector",
+      "SubCategory",
+      "ActivityData",
+      "EmissionsFactor",
+      "GHGs",
+      "DataSource",
+      "Methodology",
+      "DataSourceActivityData",
+      "DataSourceEmissionsFactor",
+      "DataSourceGHGs",
+      "DataSourceMethodology",
+      "DataSourceReportingLevel",
+      "DataSourceScope",
+      "DataSourceSector",
+      "DataSourceSubCategory",
+      "DataSourceSubSector",
+      "GDP",
+      "Inventory",
+      "Population",
+      "SectorValue",
+      "SubCategoryValue",
+      "SubSectorReportingLevel",
+      "SubSectorScope",
+      "SubSectorValue",
+      "Version",
     ];
 
     return queryInterface.sequelize.transaction(async (transaction) => {
       for (const table of tables) {
         await transaction.dropTable(table, { cascade: true, transaction });
       }
     });
-  }
+  },
 };
-