Chore: resolve conflict

Alndaly · Aug 25, 2023 · c9f7af4 · c9f7af4
2 parents 8af674e + d715e5a
commit c9f7af4
Show file tree

Hide file tree

Showing 58 changed files with 14,062 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,11 @@
 .vscode
-.env
+.env
+
+# Jan inference
+jan-inference/llm/models/**
+jan-inference/llm/.env
+
+jan-inference/sd/models/**
+jan-inference/sd/output/**
+jan-inference/sd/.env
+jan-inference/sd/sd
diff --git a/.gitmodules b/.gitmodules
@@ -7,3 +7,6 @@
 [submodule "mobile-client"]
 	path = mobile-client
 	url = [email protected]:janhq/jan-react-native.git
+[submodule "jan-inference/sd/sd_cpp"]
+	path = jan-inference/sd/sd_cpp
+	url = https://github.com/leejet/stable-diffusion.cpp
diff --git a/docs/.gitignore b/docs/.gitignore
@@ -0,0 +1,20 @@
+# Dependencies
+/node_modules
+
+# Production
+/build
+
+# Generated files
+.docusaurus
+.cache-loader
+
+# Misc
+.DS_Store
+.env.local
+.env.development.local
+.env.test.local
+.env.production.local
+
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
diff --git a/docs/README.md b/docs/README.md
@@ -0,0 +1,41 @@
+# Website
+
+This website is built using [Docusaurus 2](https://docusaurus.io/), a modern static website generator.
+
+### Installation
+
+```
+$ yarn
+```
+
+### Local Development
+
+```
+$ yarn start
+```
+
+This command starts a local development server and opens up a browser window. Most changes are reflected live without having to restart the server.
+
+### Build
+
+```
+$ yarn build
+```
+
+This command generates static content into the `build` directory and can be served using any static contents hosting service.
+
+### Deployment
+
+Using SSH:
+
+```
+$ USE_SSH=true yarn deploy
+```
+
+Not using SSH:
+
+```
+$ GIT_USER=<Your GitHub username> yarn deploy
+```
+
+If you are using GitHub pages for hosting, this command is a convenient way to build the website and push to the `gh-pages` branch.
diff --git a/docs/babel.config.js b/docs/babel.config.js
@@ -0,0 +1,3 @@
+module.exports = {
+  presets: [require.resolve('@docusaurus/core/lib/babel/preset')],
+};
diff --git a/docs/docs/about/README.md b/docs/docs/about/README.md
@@ -0,0 +1,4 @@
+---
+sidebar_position: 1
+title: Overview
+---
diff --git a/docs/docs/about/company/01-story.md b/docs/docs/about/company/01-story.md
@@ -0,0 +1,5 @@
+---
+title: Story
+---
+
+TODO: a month by month recap
diff --git a/docs/docs/about/company/02-team.md b/docs/docs/about/company/02-team.md
@@ -0,0 +1,3 @@
+---
+title: Team
+---
diff --git a/docs/docs/about/company/_category_.json b/docs/docs/about/company/_category_.json
@@ -0,0 +1,7 @@
+{
+    "label": "Company",
+    "position": 2,
+    "link": {
+        "type": "generated-index"
+    }
+}
diff --git a/docs/docs/about/handbook/01-how-we-work.md b/docs/docs/about/handbook/01-how-we-work.md
@@ -0,0 +1,3 @@
+---
+title: How We Work
+---
diff --git a/docs/docs/about/handbook/02-team-structure.md b/docs/docs/about/handbook/02-team-structure.md
@@ -0,0 +1,3 @@
+---
+title: Team Structure
+---
diff --git a/docs/docs/about/handbook/_category_.json b/docs/docs/about/handbook/_category_.json
@@ -0,0 +1,7 @@
+{
+    "label": "Handbook",
+    "position": 5,
+    "link": {
+        "type": "generated-index"
+    }
+}
diff --git a/docs/docs/about/roadmap/_category_.json b/docs/docs/about/roadmap/_category_.json
@@ -0,0 +1,7 @@
+{
+    "label": "Roadmap",
+    "position": 4,
+    "link": {
+        "type": "generated-index"
+    }
+}
diff --git a/docs/docs/about/roadmap/roadmap.md b/docs/docs/about/roadmap/roadmap.md
@@ -0,0 +1,3 @@
+---
+title: Roadmap
+---
diff --git a/docs/docs/about/strategy/01-mission-and-vision.md b/docs/docs/about/strategy/01-mission-and-vision.md
@@ -0,0 +1,4 @@
+---
+title: Mission & Vision
+---
+
diff --git a/docs/docs/about/strategy/02-customer-persona.md b/docs/docs/about/strategy/02-customer-persona.md
@@ -0,0 +1,4 @@
+---
+title: Customer Persona
+---
+
diff --git a/docs/docs/about/strategy/03-business-model.md b/docs/docs/about/strategy/03-business-model.md
@@ -0,0 +1,3 @@
+---
+title: Business Model
+---
diff --git a/docs/docs/about/strategy/04-brand.md b/docs/docs/about/strategy/04-brand.md
@@ -0,0 +1,3 @@
+---
+title: Brand
+---
diff --git a/docs/docs/about/strategy/05-okrs.md b/docs/docs/about/strategy/05-okrs.md
@@ -0,0 +1,3 @@
+---
+title: OKRs
+---
diff --git a/docs/docs/about/strategy/_category_.json b/docs/docs/about/strategy/_category_.json
@@ -0,0 +1,7 @@
+{
+    "label": "Strategy",
+    "position": 3,
+    "link": {
+        "type": "generated-index"
+    }
+}
diff --git a/docs/docs/changelog/README.md b/docs/docs/changelog/README.md
@@ -0,0 +1,6 @@
+---
+sidebar_position: 1
+---
+
+# Changelog
+TODO
diff --git a/docs/docs/developer/README.md b/docs/docs/developer/README.md
@@ -0,0 +1,6 @@
+---
+sidebar_position: 1
+---
+
+# Developer
+TODO
diff --git a/docs/docs/getting-started/README.md b/docs/docs/getting-started/README.md
@@ -0,0 +1,7 @@
+---
+sidebar_position: 1
+slug: /
+---
+
+# Getting Started
+Hi there
diff --git a/docs/docs/guides/README.md b/docs/docs/guides/README.md
@@ -0,0 +1,6 @@
+---
+sidebar_position: 1
+---
+
+# Guides
+TODO
diff --git a/docs/docs/reference/README.md b/docs/docs/reference/README.md
@@ -0,0 +1,6 @@
+---
+sidebar_position: 1
+---
+
+# Reference
+TODO