fix: Try upgrading setuptools again and remove old react frontend (#2245

)

* fix: Try upgrading setuptools again and remove old react frontend

* Remove rogue F

* Bring back node for Cypress

.github/workflows/ci.yml

@@ -23,17 +23,11 @@ jobs:
         uses: actions/setup-node@v3
         with:
           node-version: 16.x
-      - name: Install dependencies and build frontend
+      - name: Install dependencies
         run: |
           pip install pipenv
           pipenv install --dev --system
           yarn --frozen-lockfile
-      - name: Build frontend
-        run: |
-          cd portal_frontend
-          yarn --frozen-lockfile
-          yarn build
-          mv build ../portal/frontend
       - name: Collect static
         run: python example_project/manage.py collectstatic --noinput --settings portal_test_settings
       - name: Run Python tests

.github/workflows/publish-python-package.yml

@@ -21,20 +21,10 @@ jobs:
         with:
           python-version: "3.8"
           architecture: "x64"
-      - name: Setup nodejs
-        uses: actions/setup-node@v3
-        with:
-          node-version: 16.x
       - name: Install pip requirements
         run: |
           pip install pipenv
           pipenv install --dev --system
-      - name: "Install, build and move frontend"
-        run: |
-          cd portal_frontend
-          yarn --frozen-lockfile
-          yarn build
-          mv build ../portal/frontend
       - name: Release codeforlife-portal
         uses: relekang/[email protected]
         with:

.github/workflows/snyk.yaml

@@ -14,18 +14,6 @@ jobs:
         uses: actions/checkout@v3
         with:
           fetch-depth: 0
-      - name: Setup Node.js
-        uses: actions/setup-node@v3
-        with:
-          node-version: 16.x
-      - name: Install Node dependencies
-        run: npm install --prefix portal_frontend
-      - name: Run Snyk to check for vulnerabilities in Node.js
-        uses: snyk/actions/node@master
-        env:
-          SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
-        with:
-          command: monitor --file=portal_frontend/package.json --package-manager=npm --project-name="portal_frontend"
       - name: Setup python-version
         uses: actions/setup-python@v4
         with:

.gitignore

@@ -27,15 +27,11 @@ codeforlife_portal.egg-info
 build/
 # .vscode/
 dist/
-node_modules
 
 # Cypress generated folder
 /cypress
 
-# react frontend
-/portal/frontend
-
 # tunnel software
 ngrok
 
-.venv
+.venv

example_project/portal_test_settings.py

@@ -66,7 +66,7 @@
 LANGUAGE_CODE = "en-gb"
 STATIC_ROOT = os.path.join(BASE_DIR, "static")
 STATIC_URL = "/static/"
-STATICFILES_DIRS = [os.path.join(BASE_DIR, "portal/frontend/static"), os.path.join(BASE_DIR, "portal/static")]
+STATICFILES_DIRS = [os.path.join(BASE_DIR, "portal/static")]
 MEDIA_ROOT = os.path.join(STATIC_ROOT, "email_media/")
 
 WSGI_APPLICATION = "wsgi.application"
@@ -169,8 +169,7 @@
                 "common.context_processors.cookie_management_enabled",
                 "portal.context_processors.process_newsletter_form",
             ]
-        },
-        "DIRS": [os.path.join(BASE_DIR, "portal/frontend")],
+        }
     }
 ]
 

example_project/settings.py

@@ -21,7 +21,7 @@
 LANGUAGE_CODE = "en-gb"
 STATIC_ROOT = os.path.join(BASE_DIR, "static")
 STATIC_URL = "/static/"
-STATICFILES_DIRS = [os.path.join(BASE_DIR, "portal/frontend/static"), os.path.join(BASE_DIR, "portal/static")]
+STATICFILES_DIRS = [os.path.join(BASE_DIR, "portal/static")]
 MEDIA_ROOT = os.path.join(STATIC_ROOT, "email_media/")
 SECRET_KEY = "not-a-secret"
 
@@ -132,8 +132,7 @@
                 "common.context_processors.cookie_management_enabled",
                 "portal.context_processors.process_newsletter_form",
             ]
-        },
-        "DIRS": [os.path.join(BASE_DIR, "portal/frontend")],
+        }
     }
 ]
 

portal/urls.py

@@ -18,7 +18,6 @@
 )
 from portal.helpers.ratelimit import school_student_key
 from portal.helpers.regexes import ACCESS_CODE_REGEX, JWT_REGEX
-from portal.reactTestSpace import reactTestSpace
 from portal.views.about import about, getinvolved, contribute
 from portal.views.admin import AdminChangePasswordDoneView, AdminChangePasswordView
 from portal.views.aimmo.dashboard import StudentAimmoDashboard, TeacherAimmoDashboard
@@ -345,7 +344,6 @@
             ]
         ),
     ),
-    url(r"^reactTestSpace/", reactTestSpace, name="reactTestSpace"),
     url(r"^codingClub/$", coding_club, name="codingClub"),
     url(r"^codingClub/(?P<student_pack_type>[3-4])/", download_student_pack, name="download_student_pack"),
     url(r"^removeFakeAccounts/", RemoveFakeAccounts.as_view(), name="remove_fake_accounts"),