Merge branch 'noah/feature' of https://github.com/oslabs-beta/ReacType-Beta into feature/kevinnoah

Author: kevinkchandra

Dockerfile

@@ -1,36 +1,64 @@
 # Stage 1: Build
-FROM node:21.2.0-alpine as build
+FROM node:21.2.0-alpine AS build
 
 # python: required dependency for node alpine, shrinks image size from 2.17GB to 1.67GB
 RUN apk add --no-cache --virtual .gyp \
     python3 \
     make \
     g++
 
+RUN npm install -g [email protected]
+
+
 WORKDIR /app
 
 COPY package*.json ./
 
+
 RUN npm install --no-install-recommends --fetch-retry-maxtimeout 500000
 
+# install vite virst
+
+
 COPY . .
+ ENV NODE_ENV='production'
+ # i am hoping the above will make it so that the frontend files will know that it is production.
+RUN npm run prod-build 
 
 # Stage 2: Runtime
-FROM node:21.2.0-alpine as runtime
+FROM node:21.2.0-alpine AS runtime
 
 WORKDIR /app
 
 COPY --from=build /app/package*.json ./
 
-RUN npm install --no-install-recommends --only=production --fetch-retry-maxtimeout 500000
+RUN npm install --no-install-recommends --fetch-retry-maxtimeout 500000
+
+# RUN npm run dev-frontend # no, dont just run the app while building
+
+# make a build file?
 
+
+# --only=prod
 # COPY --from=build /app/.env .env
 COPY --from=build /app/config.js ./config.js
 COPY --from=build /app/server ./server
-COPY --from=build /app/build /app
+COPY --from=build /app/build /app/build
+
+COPY .env .env
+#just make the env file go into the docker image?
+
 
 EXPOSE 5656
 
-ENV IS_DOCKER true
+ENV IS_DOCKER=true
+
+
+ENV VIDEOSDK='vidsdk'
+
+ # productino you dolt!, if we are using docker, its production!
+ ENV PORT=5656
+
+# no longer put the envs here cause we are not dumb.
 
-CMD [ "npm", "start" ]
+CMD [ "npm", "start" ]

__tests__/componentBuilder.test.tsx

@@ -124,7 +124,7 @@ describe('componentBuilder', () => {
             name: 'p',
             childId: 4,
             style: {},
-            attributes: { compText: 'Hello, world!' },
+            attributes: { comptext: 'Hello, world!' },
             events: {},
             stateProps: [],
             passedInProps: [],

app/src/components/App.tsx

@@ -6,7 +6,6 @@ import { toggleLoggedIn } from '../redux/reducers/slice/appStateSlice';
 import { useDispatch } from 'react-redux';
 
 import AppContainer from '../containers/AppContainer';
-
 /**
  * The `App` component is the root component of the React application. It performs an initial check
  * to determine if a user is logged in (not a 'guest') by inspecting local storage, and updates the

app/src/components/right/ExportButton.tsx

@@ -11,6 +11,9 @@ import createModal from './createModal';
 import { RootState } from '../../redux/store';
 import zipFiles from '../../helperFunctions/zipFiles';
 
+// NOTE: from the v22 team, this file is unused, if you are editing this and nothing is changing.
+// dont say I did not warn you.
+
 /**
  * Renders an export button that triggers a modal for selecting export options.
  * The button and modal allow users to export project components in various formats.