Rollbacking to inital setup

BesLogic · Mar 23, 2024 · f20a305 · f20a305
1 parent 083729a
commit f20a305
Show file tree

Hide file tree

Showing 77 changed files with 11,778 additions and 1,024 deletions.
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
-# Carbone Québec
+# Canopeum
 
-![Alt text](carbone_quebec_frontend/public/Carbone_Quebec_Logo.png?raw=true "Logo")
+![Alt text](canopeum_frontend/public/Canopeum_Logo.jpg?raw=true "Logo")
 
 This project integrates Django backend with React Vite frontend template to create a full-stack web application.
 
@@ -25,64 +25,29 @@ For backend
 1. Fork the project:\
    ![Fork](/docs/Fork.png)
 
-<<<<<<< HEAD
-```bash
-git clone [email protected]:BesLogic/releaf-carbone-quebec.git
-cd releaf-carbone-quebec
-```
-=======
 2. Clone the repository:\
    From your fork, copy the repo's URL\
    ![Clone](/docs/Clone.png)
->>>>>>> b2e9d88ea7de41b8af810352e94a222581ae365d
 
    ```shell
    git clone <the_url_you_copied>
    cd releaf-canopeum
    ```
 
-<<<<<<< HEAD
-```bash
-docker compose up
-cd carbone_quebec_backend
-python -m venv .venv
-source .venv/scripts/activate
-python -m pip install -r requirements.txt
-python manage.py migrate
-python manage.py runserver
-```
-=======
 3. Set up a Python 3.12 virtual environment
->>>>>>> b2e9d88ea7de41b8af810352e94a222581ae365d
 
    ```shell
    cd canopeum_backend
    python3.12 -m venv .venv
    ```
 
-<<<<<<< HEAD
-```bash
-cd carbone_quebec_frontend
-npm install
-npm run dev
-```
-=======
    or on Windows if "python3.12" is not a recognized command:
->>>>>>> b2e9d88ea7de41b8af810352e94a222581ae365d
 
    ```powershell
    cd canopeum_backend
    py -3.12 -m venv .venv
    ```
 
-<<<<<<< HEAD
-```bash
-# In another CLI
-npm install -g @mockoon/cli
-cd releaf-carbone-quebec/carbone_quebec_frontend
-mockoon-cli start --data carbone-quebec-mockoon.json
-```
-=======
    Then activate the environemnt (you need to do this everytime if your editor isn't configured to do so):
 
    ```shell
@@ -125,7 +90,6 @@ mockoon-cli start --data carbone-quebec-mockoon.json
    cd releaf-canopeum/canopeum_frontend
    mockoon-cli start --data canopeum-mockoon.json
    ```
->>>>>>> b2e9d88ea7de41b8af810352e94a222581ae365d
 
 ### Folder Architecture
 

diff --git a/carbone_quebec_backend/.gitignore → canopeum_backend/.gitignore b/carbone_quebec_backend/.gitignore → canopeum_backend/.gitignore
diff --git a/carbone_quebec_backend/README.md → canopeum_backend/README.md b/carbone_quebec_backend/README.md → canopeum_backend/README.md
diff --git a/...ackend/carbone_quebec_backend/__init__.py → ...peum_backend/canopeum_backend/__init__.py b/...ackend/carbone_quebec_backend/__init__.py → ...peum_backend/canopeum_backend/__init__.py
diff --git a/...ec_backend/carbone_quebec_backend/asgi.py → canopeum_backend/canopeum_backend/asgi.py b/...ec_backend/carbone_quebec_backend/asgi.py → canopeum_backend/canopeum_backend/asgi.py
diff --git a/...ec_backend/carbone_quebec_backend/bdd.sql → canopeum_backend/canopeum_backend/bdd.sql b/...ec_backend/carbone_quebec_backend/bdd.sql → canopeum_backend/canopeum_backend/bdd.sql
diff --git a/...quebec_backend/migrations/0001_initial.py → ...nopeum_backend/migrations/0001_initial.py b/...quebec_backend/migrations/0001_initial.py → ...nopeum_backend/migrations/0001_initial.py
diff --git a/...ne_quebec_backend/migrations/0002_like.py → .../canopeum_backend/migrations/0002_like.py b/...ne_quebec_backend/migrations/0002_like.py → .../canopeum_backend/migrations/0002_like.py
diff --git a/...03_post_share_count_site_visitor_count.py → ...03_post_share_count_site_visitor_count.py b/...03_post_share_count_site_visitor_count.py → ...03_post_share_count_site_visitor_count.py
diff --git a/...zation_batchseed_batchspecies_and_more.py → ...zation_batchseed_batchspecies_and_more.py b/...zation_batchseed_batchspecies_and_more.py → ...zation_batchseed_batchspecies_and_more.py
diff --git a/...atchsupportedspecies_quantity_and_more.py → ...atchsupportedspecies_quantity_and_more.py b/...atchsupportedspecies_quantity_and_more.py → ...atchsupportedspecies_quantity_and_more.py
diff --git a/...one_quebec_backend/migrations/__init__.py → ...d/canopeum_backend/migrations/__init__.py b/...one_quebec_backend/migrations/__init__.py → ...d/canopeum_backend/migrations/__init__.py
diff --git a/..._backend/carbone_quebec_backend/models.py → canopeum_backend/canopeum_backend/models.py b/..._backend/carbone_quebec_backend/models.py → canopeum_backend/canopeum_backend/models.py
diff --git a/...end/carbone_quebec_backend/serializers.py → ...m_backend/canopeum_backend/serializers.py b/...end/carbone_quebec_backend/serializers.py → ...m_backend/canopeum_backend/serializers.py
diff --git a/...ackend/carbone_quebec_backend/settings.py → ...peum_backend/canopeum_backend/settings.py b/...ackend/carbone_quebec_backend/settings.py → ...peum_backend/canopeum_backend/settings.py
diff --git a/...ec_backend/carbone_quebec_backend/urls.py → canopeum_backend/canopeum_backend/urls.py b/...ec_backend/carbone_quebec_backend/urls.py → canopeum_backend/canopeum_backend/urls.py
diff --git a/...c_backend/carbone_quebec_backend/views.py → canopeum_backend/canopeum_backend/views.py b/...c_backend/carbone_quebec_backend/views.py → canopeum_backend/canopeum_backend/views.py
diff --git a/...ec_backend/carbone_quebec_backend/wsgi.py → canopeum_backend/canopeum_backend/wsgi.py b/...ec_backend/carbone_quebec_backend/wsgi.py → canopeum_backend/canopeum_backend/wsgi.py
diff --git a/carbone_quebec_backend/manage.py → canopeum_backend/manage.py b/carbone_quebec_backend/manage.py → canopeum_backend/manage.py
diff --git a/carbone_quebec_backend/pyproject.toml → canopeum_backend/pyproject.toml b/carbone_quebec_backend/pyproject.toml → canopeum_backend/pyproject.toml
diff --git a/carbone_quebec_backend/requirements-dev.txt → canopeum_backend/requirements-dev.txt b/carbone_quebec_backend/requirements-dev.txt → canopeum_backend/requirements-dev.txt
diff --git a/carbone_quebec_backend/requirements.txt → canopeum_backend/requirements.txt b/carbone_quebec_backend/requirements.txt → canopeum_backend/requirements.txt
diff --git a/carbone_quebec_frontend/.eslintrc.cjs → canopeum_frontend/.eslintrc.cjs b/carbone_quebec_frontend/.eslintrc.cjs → canopeum_frontend/.eslintrc.cjs
diff --git a/carbone_quebec_frontend/.gitignore → canopeum_frontend/.gitignore b/carbone_quebec_frontend/.gitignore → canopeum_frontend/.gitignore
diff --git a/canopeum_frontend/.vite/deps/_metadata.json b/canopeum_frontend/.vite/deps/_metadata.json
@@ -0,0 +1,8 @@
+{
+  "hash": "f930cf55",
+  "configHash": "358d2f29",
+  "lockfileHash": "e3b0c442",
+  "browserHash": "d492fda6",
+  "optimized": {},
+  "chunks": {}
+}
diff --git a/canopeum_frontend/.vite/deps/package.json b/canopeum_frontend/.vite/deps/package.json
@@ -0,0 +1,3 @@
+{
+  "type": "module"
+}