Merge pull request #87 from fastsurvey/0.6.1

0.6.1
fastsurvey · Dec 8, 2021 · f0af66f · f0af66f
2 parents 370d922 + 69af205
commit f0af66f
Show file tree

Hide file tree

Showing 24 changed files with 50 additions and 74 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,12 +1,10 @@
-FROM node:12
-
-COPY package.json package.json
-COPY yarn.lock yarn.lock
-
+FROM node:12 as build
+WORKDIR /app
+COPY package.json yarn.lock server.js ./
 RUN yarn install --production=true
-
-COPY server.js server.js
 COPY dist dist
 
+FROM gcr.io/distroless/nodejs
+COPY --from=build /app /
 EXPOSE 8080
-CMD [ "node", "server.js" ]
+CMD ["server.js"]
diff --git a/cypress.json b/cypress.json
@@ -1,5 +1,5 @@
 {
-    "baseUrl": "http://localhost:3000",
+    "baseUrl": "http://localhost:8080",
     "testFiles": "**/*.e2e.spec.{js,ts}",
     "component": {
         "testFiles": "**/*.ct.spec.{js,ts,jsx,tsx}",

diff --git a/cypress/integration/landing_page.e2e.spec.ts b/cypress/integration/landing_page.e2e.spec.ts
@@ -5,7 +5,6 @@ const get = getCySelector;
 
 const elements = {
     sectionIntro: () => get(['landing-section-intro'], {count: 1}),
-    sectionWhy: () => get(['landing-section-why'], {count: 1}),
     sectionDemo: () => get(['landing-section-demo'], {count: 1}),
     sectionPricing: () => get(['landing-section-pricing'], {count: 1}),
     sectionQuestions: () => get(['landing-section-faq'], {count: 1}),
@@ -19,7 +18,6 @@ describe('The Landing Page', () => {
     it('successfully loads, contains all sections', () => {
         cy.visit('/');
         elements.sectionIntro();
-        elements.sectionWhy();
         elements.sectionDemo();
         elements.sectionPricing();
         elements.sectionQuestions();

diff --git a/cypress/integration/not_found_page.e2e.spec.js b/cypress/integration/not_found_page.e2e.spec.js
@@ -6,7 +6,7 @@ describe('The Not Found Page', () => {
             .first()
             .should('have.text', 'Back to Landing Page')
             .click();
-        cy.url().should('eq', 'http://localhost:3000/');
+        cy.location('pathname').should('eq', '/');
     }
     it('works for 404s', () => {
         cy.visit('/some-unknown-url');

diff --git a/cypress/integration/page_header.e2e.spec.js b/cypress/integration/page_header.e2e.spec.js
@@ -34,7 +34,7 @@ describe('The Page Header', () => {
     it('has a working logo link', () => {
         cy.visit('/some-unknown-url');
         cy.get('header').find('a').should('have.text', 'FastSurvey').click();
-        cy.url().should('eq', 'http://localhost:3000/');
+        cy.location('pathname').should('eq', '/');
     });
 
     it('has working dark mode toggles', () => {

diff --git a/index.html b/index.html
@@ -12,6 +12,14 @@
         <meta property="og:image" content="/og-image.png" />
         <meta property="og:image:width" content="1200" />
         <meta property="og:image:height" content="628" />
+        <script
+            data-host="https://microanalytics.io"
+            data-dnt="false"
+            src="https://microanalytics.io/js/script.js"
+            id="ZwSg9rf6GA"
+            async
+            defer
+        ></script>
     </head>
     <body>
         <div id="root"></div>

diff --git a/package.json b/package.json
@@ -1,6 +1,7 @@
 {
     "name": "fastsurvey-frontend",
-    "version": "0.5.0",
+    "version": "0.6.1",
+    "main": "server.js",
     "author": {
         "name": "Moritz Makowski",
         "email": "moritz@dostuffthatmatters.dev",
@@ -9,26 +10,27 @@
     "license": "UNLICENSED",
     "scripts": {
         "develop": "vite --host",
-        "build": "tsc && vite build",
+        "build": "VITE_COMMIT_SHA=\"$(git rev-parse --short --verify HEAD)\" && tsc && vite build",
         "serve": "vite preview",
+        "analyze": "source-map-explorer 'dist/assets/*.js'",
         "cypress:integration": "cypress open",
         "cypress:component": "yarn tailwind:build && cypress open-ct",
         "tailwind:build": "npx tailwindcss -i src/styles/tailwind.css -o src/styles/tailwind.out.css"
     },
     "dependencies": {
+        "express": "^4.17.1"
+    },
+    "devDependencies": {
         "@sentry/react": "^6.15.0",
         "axios": "^0.21.1",
-        "express": "^4.17.1",
         "js-cookie": "^3.0.1",
         "lodash": "^4.17.21",
         "react": "^17.0.0",
         "react-dom": "^17.0.0",
         "react-redux": "^7.2.4",
         "react-router-dom": "^5.2.0",
         "redux": "^4.1.1",
-        "typeface-quicksand": "^1.1.13"
-    },
-    "devDependencies": {
+        "typeface-quicksand": "^1.1.13",
         "@cypress/react": "^5.10.1",
         "@cypress/vite-dev-server": "^2.2.0",
         "@cypress/webpack-dev-server": "^1.7.0",

diff --git a/scripts/build.sh b/scripts/build.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+yarn build
+docker build -t gcr.io/fastsurvey-infrastructure/frontend-dev .
diff --git a/scripts/deploy-development.sh b/scripts/deploy-development.sh
@@ -1,12 +1,11 @@
 #!/bin/bash
 
-export VITE_COMMIT_SHA="$(git rev-parse --short --verify HEAD)"
-export VITE_ENV="development"
 yarn build
 
 docker build --platform linux/amd64 -t gcr.io/fastsurvey-infrastructure/frontend-dev .
 docker push gcr.io/fastsurvey-infrastructure/frontend-dev:latest
 
+VITE_COMMIT_SHA="$(git rev-parse --short --verify HEAD)"
 gcloud run deploy frontend-dev \
     --image=gcr.io/fastsurvey-infrastructure/frontend-dev:latest \
-    --platform managed --tag "commit-$VITE_COMMIT_SHA"
+    --platform managed --tag "commit-$VITE_COMMIT_SHA"
diff --git a/scripts/deploy-maintenance.sh b/scripts/deploy-maintenance.sh
diff --git a/scripts/deploy-production.sh b/scripts/deploy-production.sh
@@ -1,11 +1,11 @@
 #!/bin/bash
 
-export VITE_COMMIT_SHA="$(git rev-parse --short --verify HEAD)"
 yarn build
 
 docker build --platform linux/amd64 -t gcr.io/fastsurvey-infrastructure/frontend .
 docker push gcr.io/fastsurvey-infrastructure/frontend:latest
 
+VITE_COMMIT_SHA="$(git rev-parse --short --verify HEAD)"
 gcloud run deploy frontend \
     --image=gcr.io/fastsurvey-infrastructure/frontend:latest \
-    --platform managed --no-traffic --tag "commit-$VITE_COMMIT_SHA"
+    --platform managed --no-traffic --tag "commit-$VITE_COMMIT_SHA"
diff --git a/scripts/run-build.sh b/scripts/run-build.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+docker run -d -p 8080:8080 gcr.io/fastsurvey-infrastructure/frontend-dev:latest
diff --git a/scripts/run-docker-build.sh b/scripts/run-docker-build.sh
diff --git a/scripts/run-vite-build.sh b/scripts/run-vite-build.sh
diff --git a/src/assets/images/editor.png b/src/assets/images/editor.png
diff --git a/src/assets/images/form.png b/src/assets/images/form.png
diff --git a/src/assets/images/image-01-create.png b/src/assets/images/image-01-create.png
diff --git a/src/assets/images/image-02-collect.png b/src/assets/images/image-02-collect.png
diff --git a/src/assets/images/image-03-analyze.png b/src/assets/images/image-03-analyze.png
diff --git a/src/assets/images/landing-example-survey.png b/src/assets/images/landing-example-survey.png
diff --git a/src/assets/images/results.png b/src/assets/images/results.png
diff --git a/src/components/landing-sections/landing-section-demo.tsx b/src/components/landing-sections/landing-section-demo.tsx
@@ -1,7 +1,7 @@
 import React, {useState} from 'react';
-import DemoImage1 from '/src/assets/images/image-01-create.png';
-import DemoImage2 from '/src/assets/images/image-02-collect.png';
-import DemoImage3 from '/src/assets/images/image-03-analyze.png';
+import DemoImage1 from '/src/assets/images/editor.png';
+import DemoImage2 from '/src/assets/images/form.png';
+import DemoImage3 from '/src/assets/images/results.png';
 import {LandingPageSection} from './section';
 
 export default function LandingSectionDemo(props: {index: number}) {
@@ -69,16 +69,16 @@ export default function LandingSectionDemo(props: {index: number}) {
                         </button>
                     ))}
                 </div>
-                <div className='w-full sm:w-[36rem] md:w-[44rem] lg:w-[60rem] lg:max-w-full !m-0'>
-                    <div className='relative w-full h-0 pt-[calc((9/16)*100%)] rounded-md shadow-md overflow-hidden'>
-                        <div className='absolute top-0 w-full h-full bg-gray-600' />
-                        <img
-                            className='absolute top-0 w-full h-full'
-                            src={
-                                [DemoImage1, DemoImage2, DemoImage3][imageIndex]
-                            }
-                        />
-                    </div>
+                <div
+                    className={
+                        'w-full sm:w-[36rem] md:w-[44rem] lg:w-[60rem] lg:max-w-full !m-0 ' +
+                        'rounded-lg shadow-md overflow-hidden'
+                    }
+                >
+                    <img
+                        className='w-full h-full'
+                        src={[DemoImage1, DemoImage2, DemoImage3][imageIndex]}
+                    />
                 </div>
             </div>
         </LandingPageSection>

diff --git a/src/components/layout/main-content.tsx b/src/components/layout/main-content.tsx
@@ -38,6 +38,7 @@ function MainContent(props: {
                         <div
                             className={
                                 'mx-2 text-2xl lg:text-2xl ' +
+                                'block md:hidden xl:block ' +
                                 'font-weight-700 lg:font-weight-600 ' +
                                 'text-gray-800 dark:text-gray-100'
                             }

diff --git a/src/main.tsx b/src/main.tsx
@@ -19,16 +19,6 @@ if (import.meta.env.MODE === 'production') {
 
 ReactDOM.render(
     <React.StrictMode>
-        {import.meta.env.MODE === 'production' && (
-            <script
-                data-host='https://microanalytics.io'
-                data-dnt='false'
-                src='https://microanalytics.io/js/script.js'
-                id='ZwSg9rf6GA'
-                async
-                defer
-            ></script>
-        )}
         <PageRouter />
     </React.StrictMode>,
     document.getElementById('root'),
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		#!/bin/bash

		docker run -d -p 8080:8080 gcr.io/fastsurvey-infrastructure/frontend-dev:latest