Migrated to Vite

Schwarz-Official · Dec 31, 2023 · 765fa47 · 765fa47
1 parent 2ddb46b
commit 765fa47
Show file tree

Hide file tree

Showing 44 changed files with 3,084 additions and 16,683 deletions.
diff --git a/.idea/Schwarz.iml b/.idea/Schwarz.iml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/Dockerfile b/Dockerfile
@@ -8,12 +8,9 @@ COPY frontend/ .
 # Copy package.json and package-lock.json (or npm-shrinkwrap.json)
 COPY frontend/package*.json ./
 
-# Install Bun globally (you may need to adjust the installation command)
-RUN npm install -g bun
-
 # Install dependencies using npm ci for caching
-RUN bun install
-RUN bun build
+RUN npm install
+RUN npm run build
 
 # Stage 2: Build Django Backend
 FROM python:3.11 as backend-builder

diff --git a/Jenkinsfile b/Jenkinsfile
@@ -30,6 +30,27 @@ pipeline {
       }
     }
 
+    stage('Qodana') {
+        environment {
+            QODANA_TOKEN = credentials('eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJvcmdhbml6YXRpb24iOiJBNm1yYSIsInByb2plY3QiOiJ6RWpiTCIsInRva2VuIjoiQURFOFoifQ.AzTHJMPmhHa-QF1Z4Wo5QGvPNIv-BazlhWOWuGwu7y0')
+        }
+        agent {
+            docker {
+                args '''
+                    -v "${WORKSPACE}":/data/project
+                    --entrypoint=""
+                    '''
+                image 'jetbrains/qodana-python'
+            }
+        }
+        when {
+            branch 'master'
+        }
+        steps {
+            sh '''qodana'''
+        }
+    }
+
 //     stage('Deploy to EKS') {
 //       when {
 //         branch 'master'

diff --git a/MyStyle.css b/MyStyle.css
diff --git a/backend/accounts/__init__.py → backend/auth/__init__.py b/backend/accounts/__init__.py → backend/auth/__init__.py
diff --git a/backend/accounts/admin.py → backend/auth/admin.py b/backend/accounts/admin.py → backend/auth/admin.py
diff --git a/backend/accounts/apps.py → backend/auth/apps.py b/backend/accounts/apps.py → backend/auth/apps.py
@@ -3,4 +3,4 @@
 
 class AccountsConfig(AppConfig):
     default_auto_field = "django.db.models.BigAutoField"
-    name = "accounts"
+    name = "auth"
diff --git a/backend/accounts/migrations/0001_initial.py → backend/auth/migrations/0001_initial.py b/backend/accounts/migrations/0001_initial.py → backend/auth/migrations/0001_initial.py
diff --git a/backend/accounts/migrations/__init__.py → backend/auth/migrations/__init__.py b/backend/accounts/migrations/__init__.py → backend/auth/migrations/__init__.py
diff --git a/backend/accounts/models.py → backend/auth/models.py b/backend/accounts/models.py → backend/auth/models.py
diff --git a/backend/accounts/renderers.py → backend/auth/renderers.py b/backend/accounts/renderers.py → backend/auth/renderers.py
diff --git a/backend/accounts/serializers.py → backend/auth/serializers.py b/backend/accounts/serializers.py → backend/auth/serializers.py
diff --git a/backend/accounts/tests.py → backend/auth/tests.py b/backend/accounts/tests.py → backend/auth/tests.py
diff --git a/backend/accounts/urls.py → backend/auth/urls.py b/backend/accounts/urls.py → backend/auth/urls.py
diff --git a/backend/accounts/utils.py → backend/auth/utils.py b/backend/accounts/utils.py → backend/auth/utils.py
diff --git a/backend/accounts/views.py → backend/auth/views.py b/backend/accounts/views.py → backend/auth/views.py
diff --git a/backend/backend/settings.py b/backend/backend/settings.py
@@ -41,7 +41,7 @@
     "corsheaders",
     "rest_framework",
     "rest_framework_simplejwt",
-    "accounts",
+    "auth",
 ]
 
 MIDDLEWARE = [
@@ -137,7 +137,7 @@
 
 DEFAULT_AUTO_FIELD = "django.db.models.BigAutoField"
 
-AUTH_USER_MODEL = "accounts.User"
+AUTH_USER_MODEL = "auth.User"
 
 SIMPLE_JWT = {
     "ACCESS_TOKEN_LIFETIME": timedelta(minutes=5),

diff --git a/backend/backend/urls.py b/backend/backend/urls.py
@@ -3,5 +3,6 @@
 
 urlpatterns = [
     path("admin/", admin.site.urls),
-    path("api/user/", include("accounts.urls")),
-]
+    path("api/user/", include("auth.urls")),
+    # path('socialmedia/', include('socialmedia.urls')),  # Include socialmedia app URLs
+]
diff --git a/backend/requirements.txt b/backend/requirements.txt
diff --git a/frontend/public/index.html → frontend/index.html b/frontend/public/index.html → frontend/index.html
@@ -1,37 +1,39 @@
 <!DOCTYPE html>
 <html lang="en">
-  <head>
-    <meta charset="utf-8" />
-    <link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
-    <meta name="viewport" content="width=device-width, initial-scale=1" />
-    <meta name="theme-color" content="#000000" />
+<head>
+    <meta charset="utf-8"/>
+    <link rel="icon" href="/favicon.ico"/>
+    <meta name="viewport" content="width=device-width, initial-scale=1"/>
+    <meta name="theme-color" content="#000000"/>
     <meta
-      name="description"
-      content="Web site created using create-react-app"
+            name="description"
+            content="Web site created using create-react-app"
     />
-    <link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
+    <link rel="apple-touch-icon" href="/logo192.png"/>
     <!--
       manifest.json provides metadata used when your web app is installed on a
       user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
     -->
-    <link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
+    <link rel="manifest" href="/manifest.json"/>
     <!--
-      Notice the use of %PUBLIC_URL% in the tags above.
+      Notice the use of  in the tags above.
       It will be replaced with the URL of the `public` folder during the build.
       Only files inside the `public` folder can be referenced from the HTML.
 
-      Unlike "/favicon.ico" or "favicon.ico", "%PUBLIC_URL%/favicon.ico" will
+      Unlike "/favicon.ico" or "favicon.ico", "/favicon.ico" will
       work correctly both with client-side routing and a non-root public URL.
       Learn how to configure a non-root public URL by running `npm run build`.
     -->
     <link rel="preconnect" href="https://fonts.googleapis.com">
     <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
     <link href="https://fonts.googleapis.com/css2?family=Poppins&display=swap" rel="stylesheet">
     <title>Schwarz | The all-in-one community for 3D Artists</title>
-  </head>
-  <body>
+</head>
+<body>
     <noscript>You need to enable JavaScript to run this app.</noscript>
     <div id="root"></div>
+    <!-- Like below. This is the script tag for bootstrapping your Vite application -->
+    <script type="module" src="/src/index.jsx"></script>
     <!--
       This HTML file is a template.
       If you open it directly in the browser, you will see an empty page.
@@ -42,5 +44,5 @@
       To begin the development, run `npm start` or `yarn start`.
       To create a production bundle, use `npm run build` or `yarn build`.
     -->
-  </body>
+    </body>
 </html>