reorganize dirs for dockerize

petegq · Mar 6, 2023 · fca546a · fca546a
1 parent 6ae154c
commit fca546a
Show file tree

Hide file tree

Showing 38 changed files with 1,074 additions and 1,988 deletions.
diff --git a/.gitignore b/.gitignore
@@ -29,6 +29,8 @@ public/main.js.LICENSE.txt
 # Deployed apps should consider commenting these lines out:
 # see https://npmjs.org/doc/faq.html#Should-I-check-my-node_modules-folder-into-git
 node_modules/
+api/node_modules/
+client/node_modules/
 bower_components/
 
 # Floobits
@@ -40,7 +42,7 @@ bower_components/
 # Environment
 .env
 cache.json
-data/
+api/data/
 .eslintrc.js
 
 src/style - official.css
diff --git a/api/DockerFile b/api/DockerFile
@@ -0,0 +1,12 @@
+FROM node:latest
+WORKDIR /api
+# copy package.json into the container at /api
+COPY package*.json /api/
+# install dependencies
+RUN npm install
+# Copy the current directory contents into the container at /api
+COPY . /api/
+# Make port 80 available to the world outside this container
+EXPOSE 80
+# Run the app when the container launches
+CMD ["npm", "start"]
diff --git a/app/bingai.js → api/app/bingai.js b/app/bingai.js → api/app/bingai.js
@@ -10,7 +10,7 @@ const askBing = async ({ text, progressCallback, convo }) => {
     // If the above doesn't work, provide all your cookies as a string instead
     // cookies: '',
     debug: false,
-    store: new KeyvFile({ filename: './data/cache.json' })
+    store: new KeyvFile({ filename: './api/data/cache.json' })
   });
 
   let options = {

diff --git a/app/chatgpt-browser.js → api/app/chatgpt-browser.js b/app/chatgpt-browser.js → api/app/chatgpt-browser.js
@@ -12,7 +12,7 @@ const browserClient = async ({ text, progressCallback, convo }) => {
   const { ChatGPTBrowserClient } = await import('@waylaidwanderer/chatgpt-api');
 
   const store = {
-    store: new KeyvFile({ filename: './data/cache.json' })
+    store: new KeyvFile({ filename: './api/data/cache.json' })
   };
 
   const client = new ChatGPTBrowserClient(clientOptions, store);

diff --git a/app/chatgpt-client.js → api/app/chatgpt-client.js b/app/chatgpt-client.js → api/app/chatgpt-client.js
@@ -11,7 +11,7 @@ const clientOptions = {
 const askClient = async ({ text, progressCallback, convo }) => {
   const ChatGPTClient = (await import('@waylaidwanderer/chatgpt-api')).default;
   const store = {
-    store: new KeyvFile({ filename: './data/cache.json' })
+    store: new KeyvFile({ filename: './api/data/cache.json' })
   };
 
   const client = new ChatGPTClient(process.env.OPENAI_KEY, clientOptions, store);

diff --git a/app/chatgpt-custom.js → api/app/chatgpt-custom.js b/app/chatgpt-custom.js → api/app/chatgpt-custom.js
@@ -11,7 +11,7 @@ const clientOptions = {
 const customClient = async ({ text, progressCallback, convo, promptPrefix, chatGptLabel }) => {
   const ChatGPTClient = (await import('@waylaidwanderer/chatgpt-api')).default;
   const store = {
-    store: new KeyvFile({ filename: './data/cache.json' })
+    store: new KeyvFile({ filename: './api/data/cache.json' })
   };
 
   clientOptions.chatGptLabel = chatGptLabel;

diff --git a/app/chatgpt.js → api/app/chatgpt.js b/app/chatgpt.js → api/app/chatgpt.js
diff --git a/app/detectCode.js → api/app/detectCode.js b/app/detectCode.js → api/app/detectCode.js
diff --git a/app/index.js → api/app/index.js b/app/index.js → api/app/index.js
diff --git a/app/titleConvo.js → api/app/titleConvo.js b/app/titleConvo.js → api/app/titleConvo.js
diff --git a/models/Conversation.js → api/models/Conversation.js b/models/Conversation.js → api/models/Conversation.js
diff --git a/models/CustomGpt.js → api/models/CustomGpt.js b/models/CustomGpt.js → api/models/CustomGpt.js
diff --git a/models/Message.js → api/models/Message.js b/models/Message.js → api/models/Message.js
diff --git a/models/Prompt.js → api/models/Prompt.js b/models/Prompt.js → api/models/Prompt.js
diff --git a/models/dbConnect.js → api/models/dbConnect.js b/models/dbConnect.js → api/models/dbConnect.js
diff --git a/models/index.js → api/models/index.js b/models/index.js → api/models/index.js
diff --git a/nodemon.json → api/nodemon.json b/nodemon.json → api/nodemon.json
diff --git a/api/package.json b/api/package.json
@@ -0,0 +1,38 @@
+{
+  "name": "chatgpt-clone",
+  "version": "1.0.0",
+  "description": "",
+  "main": "server/index.js",
+  "scripts": {
+    "start": "npx node server/index.js",
+    "server-dev": "npx nodemon server/index.js"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/danny-avila/chatgpt-clone.git"
+  },
+  "keywords": [],
+  "author": "",
+  "license": "ISC",
+  "bugs": {
+    "url": "https://github.com/danny-avila/chatgpt-clone/issues"
+  },
+  "homepage": "https://github.com/danny-avila/chatgpt-clone#readme",
+  "dependencies": {
+    "@keyv/mongo": "^2.1.8",
+    "@waylaidwanderer/chatgpt-api": "^1.15.1",
+    "cors": "^2.8.5",
+    "dotenv": "^16.0.3",
+    "keyv": "^4.5.2",
+    "keyv-file": "^0.2.0",
+    "mongoose": "^6.9.0",
+    "openai": "^3.1.0",
+    "swr": "^2.0.3",
+    "tailwind-merge": "^1.9.1",
+    "tailwindcss-animate": "^1.0.5"
+  },
+  "devDependencies": {
+    "nodemon": "^2.0.20",
+    "path": "^0.12.7"
+  }
+}
diff --git a/server/index.js → api/server/index.js b/server/index.js → api/server/index.js
@@ -4,8 +4,8 @@ const path = require('path');
 const cors = require('cors');
 const routes = require('./routes');
 const app = express();
-const port = 3050;
-const projectPath = path.join(__dirname, '..');
+const port = process.env.PORT || 3050;
+const projectPath = path.join(__dirname, '..', '..');
 dbConnect().then(() => console.log('Connected to MongoDB'));
 
 app.use(cors());

diff --git a/server/routes/ask.js → api/server/routes/ask.js b/server/routes/ask.js → api/server/routes/ask.js
diff --git a/server/routes/askBing.js → api/server/routes/askBing.js b/server/routes/askBing.js → api/server/routes/askBing.js
diff --git a/server/routes/convos.js → api/server/routes/convos.js b/server/routes/convos.js → api/server/routes/convos.js
diff --git a/server/routes/customGpts.js → api/server/routes/customGpts.js b/server/routes/customGpts.js → api/server/routes/customGpts.js
diff --git a/server/routes/handlers.js → api/server/routes/handlers.js b/server/routes/handlers.js → api/server/routes/handlers.js
diff --git a/server/routes/index.js → api/server/routes/index.js b/server/routes/index.js → api/server/routes/index.js
diff --git a/server/routes/messages.js → api/server/routes/messages.js b/server/routes/messages.js → api/server/routes/messages.js
diff --git a/server/routes/prompts.js → api/server/routes/prompts.js b/server/routes/prompts.js → api/server/routes/prompts.js