Merge pull request #4 from lora322/ai-dev

Ai dev update

backend/Dockerfile

@@ -1,6 +1,7 @@
 FROM node:20.15.1-alpine
 
-RUN apk update && apk add bash
+RUN apk update && apk add bash python3 make g++ \
+  && rm -rf /var/cache/apk/*
 # Create app directory
 WORKDIR /usr/src/app
 

backend/package.json

@@ -12,7 +12,7 @@
   "dependencies": {
     "@google-cloud/storage": "^5.18.2",
     "axios": "^1.6.7",
-    "bcrypt": "5.1.1",
+    "bcryptjs": "^2.4.3",
     "chokidar": "^4.0.3",
     "cors": "2.8.5",
     "csv-parser": "^3.0.0",

backend/src/auth/auth.js

@@ -6,8 +6,8 @@ const db = require('../db/models');
 const passport = require('passport');
 const JWTstrategy = require('passport-jwt').Strategy;
 const ExtractJWT = require('passport-jwt').ExtractJwt;
-const GoogleStrategy = require('passport-google-oauth2').Strategy;
+// const GoogleStrategy = require('passport-google-oauth2').Strategy;
-const MicrosoftStrategy = require('passport-microsoft').Strategy;
+// const MicrosoftStrategy = require('passport-microsoft').Strategy;
 const UsersDBApi = require('../db/api/users');
 
 passport.use(
@@ -35,34 +35,34 @@ passport.use(
   ),
 );
 
-passport.use(
+// passport.use(
-  new GoogleStrategy(
+//   new GoogleStrategy(
-    {
+//     {
-      clientID: config.google.clientId,
+//      clientID: config.google.clientId,
-      clientSecret: config.google.clientSecret,
+//      clientSecret: config.google.clientSecret,
-      callbackURL: config.apiUrl + '/auth/signin/google/callback',
+//      callbackURL: config.apiUrl + '/auth/signin/google/callback',
-      passReqToCallback: true,
+//      passReqToCallback: true,
-    },
+//    },
-    function (request, accessToken, refreshToken, profile, done) {
+//    function (request, accessToken, refreshToken, profile, done) {
-      socialStrategy(profile.email, profile, providers.GOOGLE, done);
+//      socialStrategy(profile.email, profile, providers.GOOGLE, done);
-    },
+//    },
-  ),
+//  ),
-);
+//);
 
-passport.use(
+// passport.use(
-  new MicrosoftStrategy(
+//   new MicrosoftStrategy(
-    {
+//    {
-      clientID: config.microsoft.clientId,
+//      clientID: config.microsoft.clientId,
-      clientSecret: config.microsoft.clientSecret,
+//      clientSecret: config.microsoft.clientSecret,
-      callbackURL: config.apiUrl + '/auth/signin/microsoft/callback',
+//      callbackURL: config.apiUrl + '/auth/signin/microsoft/callback',
-      passReqToCallback: true,
+//      passReqToCallback: true,
-    },
+//    },
-    function (request, accessToken, refreshToken, profile, done) {
+//    function (request, accessToken, refreshToken, profile, done) {
-      const email = profile._json.mail || profile._json.userPrincipalName;
+//      const email = profile._json.mail || profile._json.userPrincipalName;
-      socialStrategy(email, profile, providers.MICROSOFT, done);
+//      socialStrategy(email, profile, providers.MICROSOFT, done);
-    },
+//    },
-  ),
+//  ),
-);
+// );
 
 function socialStrategy(email, profile, provider, done) {
   db.users

backend/src/config.js

@@ -16,7 +16,7 @@ const config = {
     GOOGLE: 'google',
     MICROSOFT: 'microsoft',
   },
-  secret_key: process.env.SECRET_KEY || '',
+  secret_key: process.env.jwt_secret_key || process.env.JWT_SECRET || process.env.SECRET_KEY || '',
   remote: '',
   port: process.env.NODE_ENV === 'production' ? '' : '8080',
   hostUI: process.env.NODE_ENV === 'production' ? '' : 'http://localhost',

backend/src/db/api/users.js

@@ -3,7 +3,7 @@ const FileDBApi = require('./file');
 const crypto = require('crypto');
 const Utils = require('../utils');
 
-const bcrypt = require('bcrypt');
+const bcrypt = require('bcryptjs');
 const config = require('../../config');
 
 const Sequelize = db.Sequelize;

backend/src/db/models/activities.js

@@ -1,7 +1,7 @@
 const config = require('../../config');
 const providers = config.providers;
 const crypto = require('crypto');
-const bcrypt = require('bcrypt');
+const bcrypt = require('bcryptjs');
 const moment = require('moment');
 
 module.exports = function (sequelize, DataTypes) {

backend/src/db/models/appraisals.js

@@ -1,7 +1,7 @@
 const config = require('../../config');
 const providers = config.providers;
 const crypto = require('crypto');
-const bcrypt = require('bcrypt');
+const bcrypt = require('bcryptjs');
 const moment = require('moment');
 
 module.exports = function (sequelize, DataTypes) {

backend/src/db/models/clients.js

@@ -1,7 +1,7 @@
 const config = require('../../config');
 const providers = config.providers;
 const crypto = require('crypto');
-const bcrypt = require('bcrypt');
+const bcrypt = require('bcryptjs');
 const moment = require('moment');
 
 module.exports = function (sequelize, DataTypes) {

backend/src/db/models/invoices.js

@@ -1,7 +1,7 @@
 const config = require('../../config');
 const providers = config.providers;
 const crypto = require('crypto');
-const bcrypt = require('bcrypt');
+const bcrypt = require('bcryptjs');
 const moment = require('moment');
 
 module.exports = function (sequelize, DataTypes) {

backend/src/db/models/messages.js

@@ -1,7 +1,7 @@
 const config = require('../../config');
 const providers = config.providers;
 const crypto = require('crypto');
-const bcrypt = require('bcrypt');
+const bcrypt = require('bcryptjs');
 const moment = require('moment');
 
 module.exports = function (sequelize, DataTypes) {

backend/src/db/models/notifications.js

@@ -1,7 +1,7 @@
 const config = require('../../config');
 const providers = config.providers;
 const crypto = require('crypto');
-const bcrypt = require('bcrypt');
+const bcrypt = require('bcryptjs');
 const moment = require('moment');
 
 module.exports = function (sequelize, DataTypes) {

backend/src/db/models/orders.js

@@ -1,7 +1,7 @@
 const config = require('../../config');
 const providers = config.providers;
 const crypto = require('crypto');
-const bcrypt = require('bcrypt');
+const bcrypt = require('bcryptjs');
 const moment = require('moment');
 
 module.exports = function (sequelize, DataTypes) {

backend/src/db/models/organizations.js

@@ -1,7 +1,7 @@
 const config = require('../../config');
 const providers = config.providers;
 const crypto = require('crypto');
-const bcrypt = require('bcrypt');
+const bcrypt = require('bcryptjs');
 const moment = require('moment');
 
 module.exports = function (sequelize, DataTypes) {

backend/src/db/models/permissions.js

@@ -1,7 +1,7 @@
 const config = require('../../config');
 const providers = config.providers;
 const crypto = require('crypto');
-const bcrypt = require('bcrypt');
+const bcrypt = require('bcryptjs');
 const moment = require('moment');
 
 module.exports = function (sequelize, DataTypes) {

backend/src/db/models/properties.js

@@ -1,7 +1,7 @@
 const config = require('../../config');
 const providers = config.providers;
 const crypto = require('crypto');
-const bcrypt = require('bcrypt');
+const bcrypt = require('bcryptjs');
 const moment = require('moment');
 
 module.exports = function (sequelize, DataTypes) {

backend/src/db/models/roles.js

@@ -1,7 +1,7 @@
 const config = require('../../config');
 const providers = config.providers;
 const crypto = require('crypto');
-const bcrypt = require('bcrypt');
+const bcrypt = require('bcryptjs');
 const moment = require('moment');
 
 module.exports = function (sequelize, DataTypes) {

backend/src/db/models/users.js

@@ -1,7 +1,7 @@
 const config = require('../../config');
 const providers = config.providers;
 const crypto = require('crypto');
-const bcrypt = require('bcrypt');
+const bcrypt = require('bcryptjs');
 const moment = require('moment');
 
 module.exports = function (sequelize, DataTypes) {

backend/src/db/seeders/20200430130759-admin-user.js

@@ -1,5 +1,5 @@
 'use strict';
-const bcrypt = require('bcrypt');
+const bcrypt = require('bcryptjs');
 const config = require('../../config');
 
 const ids = [

backend/src/index.js

@@ -14,6 +14,7 @@ const authRoutes = require('./routes/auth');
 const fileRoutes = require('./routes/file');
 const searchRoutes = require('./routes/search');
 const pexelsRoutes = require('./routes/pexels');
+app.use('/pexels', pexelsRoutes);
 
 const organizationForAuthRoutes = require('./routes/organizationLogin');
 

backend/src/services/auth.js

@@ -1,7 +1,7 @@
 const UsersDBApi = require('../db/api/users');
 const ValidationError = require('./notifications/errors/validation');
 const ForbiddenError = require('./notifications/errors/forbidden');
-const bcrypt = require('bcrypt');
+const bcrypt = require('bcryptjs');
 const EmailAddressVerificationEmail = require('./email/list/addressVerification');
 const InvitationEmail = require('./email/list/invitation');
 const PasswordResetEmail = require('./email/list/passwordReset');

docker/.env:

@@ -0,0 +1,15 @@
+# Database (Postgres container)
+DB_USER=postgres
+DB_PASSWORD=postgres
+DB_HOST=db
+DB_PORT=5432
+DB_NAME=postgres
+
+# Backend server
+BACKEND_PORT=4000
+JWT_SECRET=e33c3a546ba48074fbb8fcf04cfea1db9665f3211959a8825bdbdda174ff4b3b
+GOOGLE_CLIENT_ID=
+GOOGLE_CLIENT_SECRET=
+
+# Frontend
+FRONT_PORT=3000

docker/docker-compose.yml

@@ -1,12 +1,10 @@
-
-
 version: "3.9"
 services:
   web:
     image: frontend
     build: ../frontend
-    stdin_open: true # docker run -i
+    stdin_open: true
-    tty: true        # docker run -t
+    tty: true
     ports:
       - "3000:3000"
     logging:
@@ -14,6 +12,7 @@ services:
       options:
         max-size: "10m"
         max-file: "3"
+
   db:
     image: postgres
     volumes:
@@ -28,13 +27,20 @@ services:
       options:
         max-size: "10m"
         max-file: "3"
+
   backend:
     build: ../backend
     volumes:
       - ./wait-for-it.sh:/usr/src/app/wait-for-it.sh
       - ./start-backend.sh:/usr/src/app/start-backend.sh
+    env_file:
+    - ../backend/.env
     environment:
       - DB_HOST=db
+      - DB_PORT=5432
+      - DB_NAME=postgres
+      - DB_USER=postgres
+      - DB_PASSWORD=postgres
     ports:
       - "8080:8080"
     logging:
@@ -44,4 +50,5 @@ services:
         max-file: "3"
     depends_on:
       - db
-    command: ["bash", "./wait-for-it.sh", "db:5432", "--timeout=0", "--strict", "--", "bash", "./start-
+    command: ["bash", "./wait-for-it.sh", "db:5432", "--timeout=0", "--strict", "--", "bash", "./start-backend.sh"]
+

frontend/package.json

@@ -17,7 +17,7 @@
     "@tailwindcss/typography": "^0.5.13",
     "@tinymce/tinymce-react": "^4.3.2",
     "apexcharts": "^3.45.2",
-    "axios": "^1.8.4",
+    "axios": "^1.11.0",
     "chart.js": "^4.4.1",
     "chroma-js": "^2.4.2",
     "dayjs": "^1.11.10",

frontend/src/helpers/pexels.ts

@@ -2,7 +2,7 @@ import axios from 'axios';
 
 export async function getPexelsImage() {
   try {
-    const response = await axios.get(`/pexels/image`);
+    const response = await axios.get('https://organic-telegram-vgj9qwg6r95cxqqv-8080.app.github.dev/pexels/image');
     return response.data;
   } catch (error) {
     console.error('Error fetching image:', error);

package-lock.json

@@ -1,12 +0,0 @@
-{
-  "name": "app",
-  "version": "0.0.0",
-  "lockfileVersion": 2,
-  "requires": true,
-  "packages": {
-    "": {
-      "name": "app",
-      "version": "0.0.0"
-    }
-  }
-}

package.json

@@ -1,9 +1,9 @@
 {
   "name": "app",
   "version": "0.0.0",
-"scripts": {
+  "scripts": {
     "build:production": "cd ./frontend && yarn install && yarn run build && rm -rf ./node_modules && cd ../backend && yarn install",
     "start:production": "cd ./backend && NODE_ENV=production yarn start"
-  }
+  },
-
+  "dependencies": {}
 }