Merge pull request #37 from alberto-abarzua/fix/minor_improvements

Fix/minor improvements
alberto-abarzua · Nov 15, 2023 · 72c7e85 · 72c7e85
2 parents f16122c + 88286c6
commit 72c7e85
Show file tree

Hide file tree

Showing 43 changed files with 682 additions and 398 deletions.
diff --git a/.github/workflows/backend-ci.yaml b/.github/workflows/backend-ci.yaml
@@ -0,0 +1,37 @@
+
+name: Backend Arm Ci
+
+on:
+  push:
+    paths:
+      - 'backend/**'
+
+jobs:
+  build-test:
+    runs-on: ubuntu-latest
+    environment: general
+    env:
+      ESP_CONTROLLER_SERVER_PORT: ${{ vars.ESP_CONTROLLER_SERVER_PORT }}
+      ESP_CONTROLLER_SERVER_HOST: ${{ vars.ESP_CONTROLLER_SERVER_HOST }}
+      ESP_WIFI_SSID: ${{ vars.ESP_WIFI_SSID }}
+      ESP_WIFI_PASSWORD: ${{ vars.ESP_WIFI_PASSWORD }}
+      CONTROLLER_WEBSOCKET_PORT: ${{ vars.CONTROLLER_WEBSOCKET_PORT }}
+      CONTROLLER_SERVER_PORT: ${{ vars.CONTROLLER_SERVER_PORT }}
+      BACKEND_HTTP_PORT: ${{ vars.BACKEND_HTTP_PORT }}
+      NEXT_PUBLIC_BACKEND_URL: ${{ vars.NEXT_PUBLIC_BACKEND_URL }}
+    steps:
+      - name: Check out repository
+        uses: actions/checkout@v3
+      - name: Set Env File
+        run: printenv | grep -v "^\(PWD\|SHLVL\|HOME\)" > .env
+      - name: Build backend container
+        run: ./manage.py build --container backend
+
+      - name: Lint Backend
+        run: ./manage.py lint --container backend
+
+      - name: Stop and remove containers
+        if: always()
+        run: ./manage.py down
+
+
diff --git a/.github/workflows/controller-ci.yaml b/.github/workflows/controller-ci.yaml
@@ -0,0 +1,46 @@
+
+name: General Arm Ci
+
+on:
+  push:
+    paths:
+      - 'firmware/**'
+      - 'controller/**'
+
+jobs:
+  build-test:
+    runs-on: ubuntu-latest
+    environment: general
+    env:
+      ESP_CONTROLLER_SERVER_PORT: ${{ vars.ESP_CONTROLLER_SERVER_PORT }}
+      ESP_CONTROLLER_SERVER_HOST: ${{ vars.ESP_CONTROLLER_SERVER_HOST }}
+      ESP_WIFI_SSID: ${{ vars.ESP_WIFI_SSID }}
+      ESP_WIFI_PASSWORD: ${{ vars.ESP_WIFI_PASSWORD }}
+      CONTROLLER_WEBSOCKET_PORT: ${{ vars.CONTROLLER_WEBSOCKET_PORT }}
+      CONTROLLER_SERVER_PORT: ${{ vars.CONTROLLER_SERVER_PORT }}
+      BACKEND_HTTP_PORT: ${{ vars.BACKEND_HTTP_PORT }}
+    steps:
+      - name: Check out repository
+        uses: actions/checkout@v3
+      - name: Set Env File
+        run: printenv | grep -v "^\(PWD\|SHLVL\|HOME\)" > .env
+      - name: Build Controller Container
+        run: |
+          ./manage.py build --container controller
+      - name: Build Firmware Container
+        run: |
+          ./manage.py build --container firmware
+      
+      - name: Lint Controller
+        run: ./manage.py lint --container controller
+
+      - name: Run Firmware and Controller Tests
+        run: ./manage.py test
+
+      - name: Stop and remove containers
+        if: always()
+        run: ./manage.py down
+
+
+
+
diff --git a/.github/workflows/firmware-ci.yaml b/.github/workflows/firmware-ci.yaml
@@ -0,0 +1,58 @@
+
+name: Firmware CI
+
+on:
+  push:
+    paths:
+      - 'firmware/**'
+
+jobs:
+  linux-build:
+    runs-on: ubuntu-latest
+    environment: general
+    env:
+      ESP_CONTROLLER_SERVER_PORT: ${{ vars.ESP_CONTROLLER_SERVER_PORT }}
+      ESP_CONTROLLER_SERVER_HOST: ${{ vars.ESP_CONTROLLER_SERVER_HOST }}
+      ESP_WIFI_SSID: ${{ vars.ESP_WIFI_SSID }}
+      ESP_WIFI_PASSWORD: ${{ vars.ESP_WIFI_PASSWORD }}
+    steps:
+      - name: Check out repository
+        uses: actions/checkout@v3
+      - name: Set Env File
+        run: printenv | grep -v "^\(PWD\|SHLVL\|HOME\)" > .env
+
+      - name: Build Firmware Container for Linux
+        run: ./manage.py build --container firmware
+
+      - name: Build Firmware for Linux
+        run: ./manage.py buildf
+
+      - name: Stop and remove containers
+        if: always()
+        run: ./manage.py down
+
+  esp-idf-build: 
+    runs-on: ubuntu-latest
+    environment: general
+    env:
+      ESP_CONTROLLER_SERVER_HOST: ${{ vars.ESP_CONTROLLER_SERVER_HOST }}
+      ESP_CONTROLLER_SERVER_PORT: ${{ vars.ESP_CONTROLLER_SERVER_PORT }}
+      ESP_WIFI_SSID: ${{ vars.ESP_WIFI_SSID }}
+      ESP_WIFI_PASSWORD: ${{ vars.ESP_WIFI_PASSWORD }}
+    steps:
+      - name: Check out repository
+        uses: actions/checkout@v3
+
+
+      - name: Set Env File
+        run: printenv | grep -v "^\(PWD\|SHLVL\|HOME\)" > .env
+
+      - name: Build ESP-IDF Container
+        run: ./manage.py build --container esp-idf
+
+      - name: Build firmware for ESP32 using ESP-IDF
+        run: ./manage.py build-esp
+
+
+
+
diff --git a/.github/workflows/frontend-ci.yaml b/.github/workflows/frontend-ci.yaml
@@ -0,0 +1,56 @@
+
+name: General Arm Ci
+
+on:
+  push:
+    paths:
+      - 'frontend/**'
+
+jobs:
+  build-test:
+    runs-on: ubuntu-latest
+    environment: general
+    env:
+      ESP_CONTROLLER_SERVER_PORT: ${{ vars.ESP_CONTROLLER_SERVER_PORT }}
+      ESP_CONTROLLER_SERVER_HOST: ${{ vars.ESP_CONTROLLER_SERVER_HOST }}
+      ESP_WIFI_SSID: ${{ vars.ESP_WIFI_SSID }}
+      ESP_WIFI_PASSWORD: ${{ vars.ESP_WIFI_PASSWORD }}
+      CONTROLLER_WEBSOCKET_PORT: ${{ vars.CONTROLLER_WEBSOCKET_PORT }}
+      CONTROLLER_SERVER_PORT: ${{ vars.CONTROLLER_SERVER_PORT }}
+      BACKEND_HTTP_PORT: ${{ vars.BACKEND_HTTP_PORT }}
+      NEXT_PUBLIC_BACKEND_URL: ${{ vars.NEXT_PUBLIC_BACKEND_URL }}
+    steps:
+      - name: Check out repository
+        uses: actions/checkout@v3
+      - name: Set Env File
+        run: printenv | grep -v "^\(PWD\|SHLVL\|HOME\)" > .env
+      - name: Build frontend container
+        run: ./manage.py build --container frontend
+
+      - name: Lint Frontend
+        run: ./manage.py lint --container frontend  
+
+      - name: Stop and remove containers
+        if: always()
+        run: ./manage.py down
+
+  esp-idf-build: 
+    runs-on: ubuntu-latest
+    environment: general
+    env:
+      ESP_CONTROLLER_SERVER_HOST: ${{ vars.ESP_CONTROLLER_SERVER_HOST }}
+      ESP_CONTROLLER_SERVER_PORT: ${{ vars.ESP_CONTROLLER_SERVER_PORT }}
+      ESP_WIFI_SSID: ${{ vars.ESP_WIFI_SSID }}
+      ESP_WIFI_PASSWORD: ${{ vars.ESP_WIFI_PASSWORD }}
+    steps:
+      - name: Check out repository
+        uses: actions/checkout@v3
+      - name: Set Env File
+        run: printenv | grep -v "^\(PWD\|SHLVL\|HOME\)" > .env
+
+      - name: Esp-idf Build
+        run: ./manage.py build-esp
+
+
+
+
diff --git a/arm_docs/README.md b/arm_docs/README.md
diff --git a/arm_docs/docusaurus.config.js b/arm_docs/docusaurus.config.js
@@ -9,7 +9,8 @@ import { themes as prismThemes } from "prism-react-renderer";
 /** @type {import('@docusaurus/types').Config} */
 const config = {
   title: "RiBot",
-  tagline: "Navigate Robotics with Ease: Simple Software and Interface for Your Robot DIY Robot Arm",
+  tagline:
+    "Navigate Robotics with Ease: Simple Software and Interface for Your Robot DIY Robot Arm",
   favicon: "img/favicon.ico",
 
   // Set the production url of your site here
@@ -21,7 +22,7 @@ const config = {
   // GitHub pages deployment config.
   // If you aren't using GitHub pages, you don't need these.
   organizationName: "alberto-abarzua", // Usually your GitHub org/user name.
-  projectName: "robot-arm-control", // Usually your repo name.
+  projectName: "ribot", // Usually your repo name.
 
   onBrokenLinks: "throw",
   onBrokenMarkdownLinks: "warn",
@@ -93,7 +94,7 @@ const config = {
             label: "Docs",
           },
           {
-            href: "https://github.com/alberto-abarzua/robot-arm-control",
+            href: "https://github.com/alberto-abarzua/ribot",
             label: "GitHub",
             position: "right",
           },
@@ -116,12 +117,8 @@ const config = {
             items: [
               {
                 label: "GitHub",
-                href: "https://github.com/alberto-abarzua/robot-arm-control",
+                href: "https://github.com/alberto-abarzua/ribot",
               },
-              // {
-              //   label: "Docker Hub",
-              //   href: "https://hub.docker.com/r/albertoabarzua/robot-arm-control",
-              // },
             ],
           },
         ],

diff --git a/arm_docs/src/components/HomepageFeatures/index.js b/arm_docs/src/components/HomepageFeatures/index.js
@@ -1,6 +1,6 @@
 const FeatureList = [
   {
-    title: "Easy to Use",
+    title: "Easy to Use Interface",
     Svg: require("@site/static/img/exp.svg").default,
     description: (
       <>

diff --git a/arm_docs/src/pages/index.js b/arm_docs/src/pages/index.js
@@ -6,12 +6,12 @@ import HomepageFeatures from "@site/src/components/HomepageFeatures";
 function HomepageHeader() {
   const { siteConfig } = useDocusaurusContext();
   return (
-    <header className="w-full bg-orange-400 h-60">
+    <header className="w-full bg-orange-400 h-72 px-4 py-6">
       <div className="w-full flex flex-col items-center h-full justify-center">
         <h1 className="text-5xl font-bold text-gray-800">{siteConfig.title}</h1>
-        <h3 className="mt-4 text-xl  text-gray-800 px-5">{siteConfig.tagline}</h3>
+        <h3 className="mt-4 text-xl  text-gray-800 ">{siteConfig.tagline}</h3>
         <div className="flex gap-5 mt-5">
-        <Link className='mt-5 button button--secondary button--lg' to='/docs/introduction/intro'>Get Started</Link>
+        <Link className='my-5 button button--secondary button--lg' to='/docs/introduction/intro'>Get Started</Link>
       </div>
 
       </div>