From 03182ff49e684f00d0a9d2d73277b9fc91f54ab8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joonas=20Sepp=C3=A4?= <joasep@utu.fi>
Date: Sun, 12 Mar 2023 16:58:18 +0200
Subject: [PATCH] Trying to fix deployment 2: removing front-end build stage
from gitlab CI/CD
---
.gitlab-ci.yml | 10 ----------
messages-app-frontend/src/index.tsx | 4 ++--
2 files changed, 2 insertions(+), 12 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8f5299a..2f940f3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -14,16 +14,6 @@ build-backend:
paths:
- "messagesAppBackend/build/"
-build-frontend:
- stage: build
- script:
- - cd messages-app-frontend
- - npm install
- - npm run build
- artifacts:
- paths:
- - "messages-app-frontend/build/"
-
deploy-backend-to-heroku:
image: ruby:latest
stage: deploy
diff --git a/messages-app-frontend/src/index.tsx b/messages-app-frontend/src/index.tsx
index 1cd9980..4515ac1 100644
--- a/messages-app-frontend/src/index.tsx
+++ b/messages-app-frontend/src/index.tsx
@@ -5,7 +5,7 @@ import CssBaseline from "@mui/material/CssBaseline";
import { ThemeProvider, createTheme } from "@mui/material/styles";
-const theme = createTheme({
+const myTheme = createTheme({
palette: {
background: {
default: "grey"
@@ -18,7 +18,7 @@ const root = ReactDOM.createRoot(
);
root.render(
<React.StrictMode>
- <ThemeProvider theme={theme}>
+ <ThemeProvider theme={myTheme}>
<CssBaseline />
<App />
</ThemeProvider>
--
GitLab