Merge pull request #51 from fastsurvey/implement-landing-page

Release 0.3 Sprint
fastsurvey · Sep 13, 2021 · a600b43 · a600b43
2 parents 588b4ab + d20d9d6
commit a600b43
Show file tree

Hide file tree

Showing 89 changed files with 3,545 additions and 11,497 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,6 +2,7 @@
 .idea
 *.out.css
 scripts
+dist
 
 # See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
 
@@ -593,4 +594,4 @@ $RECYCLE.BIN/
 # Windows shortcuts
 *.lnk
 
-# End of https://www.gitignore.io/api/git,node,react,linux,macos,flask,python,pycharm,windows,intellij,webstorm
+# End of https://www.gitignore.io/api/git,node,react,linux,macos,flask,python,pycharm,windows,intellij,webstorm
diff --git a/Dockerfile b/Dockerfile
@@ -6,7 +6,7 @@ COPY yarn.lock yarn.lock
 RUN yarn install --production=true
 
 COPY server.js server.js
-COPY build build
+COPY dist dist
 
 EXPOSE 8080
 CMD [ "node", "server.js" ]
diff --git a/README.md b/README.md
diff --git a/app.js b/app.js
diff --git a/app.yaml b/app.yaml
diff --git a/icon-information.svg b/icon-information.svg
diff --git a/index.html b/index.html
@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<html lang="en">
+    <head>
+        <meta charset="UTF-8" />
+        <link
+            rel="icon"
+            type="image/svg+xml"
+            href="/src/assets/branding/favicon.svg"
+        />
+        <link
+            rel="icon"
+            type="image/png"
+            href="/src/assets/branding/favicon-512.png"
+        />
+        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+        <title>FastSurvey</title>
+        <meta name="og:title" content="FastSurvey" />
+        <meta
+            name="og:description"
+            content="Never assume anymore - transparent, fair and usable online surveys"
+        />
+    </head>
+    <body>
+        <div id="root"></div>
+        <script type="module" src="/src/main.tsx"></script>
+    </body>
+</html>
diff --git a/package.json b/package.json
@@ -6,61 +6,33 @@
         "email": "moritz@dostuffthatmatters.dev",
         "url": "https://dostuffthatmatters.dev/"
     },
+    "scripts": {
+        "develop": "vite --host",
+        "build": "tsc && vite build",
+        "serve": "vite preview"
+    },
     "dependencies": {
-        "axios": "^0.19.2",
+        "axios": "^0.21.1",
         "express": "^4.17.1",
         "lodash": "^4.17.21",
-        "node-sass": "^4.14.1",
-        "react": "^16.13.1",
-        "react-dom": "^16.13.1",
-        "react-redux": "^7.2.0",
+        "react": "^17.0.0",
+        "react-dom": "^17.0.0",
+        "react-redux": "^7.2.4",
         "react-router-dom": "^5.2.0",
-        "react-scripts": "3.4.1",
-        "redux": "^4.0.5"
-    },
-    "scripts": {
-        "develop": "react-scripts start",
-        "develop:tailwind": "NODE_ENV=development postcss src/styles/tailwind.css -o src/styles/tailwind.out.css -w",
-        "build": "react-scripts build",
-        "build:tailwind": "NODE_ENV=production postcss src/styles/tailwind.css -o src/styles/tailwind.out.css",
-        "serve": "node app.js",
-        "lint": "tslint 'src/**/*.{ts,tsx,js}'",
-        "test": "react-scripts test"
-    },
-    "eslintConfig": {
-        "extends": "react-app"
-    },
-    "browserslist": {
-        "production": [
-            ">0.2%",
-            "not dead",
-            "not op_mini all"
-        ],
-        "development": [
-            "last 1 chrome version",
-            "last 1 firefox version",
-            "last 1 safari version"
-        ]
+        "redux": "^4.1.1",
+        "typeface-quicksand": "^1.1.13"
     },
     "devDependencies": {
-        "@tailwindcss/jit": "^0.1.18",
-        "@testing-library/jest-dom": "^4.2.4",
-        "@testing-library/react": "^9.3.2",
-        "@testing-library/user-event": "^7.1.2",
-        "@types/jest": "^24.0.0",
-        "@types/lodash": "^4.14.168",
-        "@types/node": "^12.0.0",
-        "@types/react": "^16.9.0",
-        "@types/react-dom": "^16.9.0",
-        "@types/react-redux": "^7.1.9",
-        "@types/react-router-dom": "^5.1.5",
-        "@types/redux": "^3.6.0",
-        "autoprefixer": "^10.2.5",
-        "postcss": "^8.2.13",
-        "postcss-cli": "^8.3.1",
-        "tailwindcss": "^2.1.2",
-        "ts-jest": "^26.3.0",
-        "tslint": "^6.1.2",
-        "typescript": "^3.9.5"
+        "@types/jest": "^26.0.23",
+        "@types/lodash": "^4.14.170",
+        "@types/react": "^17.0.0",
+        "@types/react-dom": "^17.0.0",
+        "@types/react-router-dom": "^5.1.7",
+        "@vitejs/plugin-react-refresh": "^1.3.1",
+        "autoprefixer": "^10.2.6",
+        "jest": "^27.0.6",
+        "tailwindcss": "^2.2.4",
+        "typescript": "^4.3.2",
+        "vite": "^2.3.8"
     }
 }
diff --git a/postcss.config.js b/postcss.config.js
@@ -1,3 +1,6 @@
 module.exports = {
-    plugins: [require('autoprefixer'), require('@tailwindcss/jit')],
-};
+    plugins: [
+        require('tailwindcss'),
+        require('autoprefixer'),
+    ]
+};
diff --git a/public/favicon_512.ico b/public/favicon_512.ico
diff --git a/public/index.html b/public/index.html
diff --git a/public/manifest.json b/public/manifest.json
diff --git a/public/robots.txt b/public/robots.txt
diff --git a/public/rocket_1024.png b/public/rocket_1024.png
diff --git a/public/rocket_192.png b/public/rocket_192.png
diff --git a/public/rocket_256.png b/public/rocket_256.png
diff --git a/public/rocket_384.png b/public/rocket_384.png
diff --git a/public/rocket_512.png b/public/rocket_512.png
diff --git a/public/rocket_768.png b/public/rocket_768.png
diff --git a/server.js b/server.js
@@ -5,11 +5,11 @@ const app = express();
 app.disable('x-powered-by');
 
 // Serve the static files from the React app
-app.use(express.static(path.join(__dirname + '/build')));
+app.use(express.static(path.join(__dirname + '/dist')));
 
 // Handles any requests that don't match the ones above
 app.get('*', (req, res) => {
-    res.sendFile(path.join(__dirname + '/build/index.html'));
+    res.sendFile(path.join(__dirname + '/dist/index.html'));
 });
 
 // Start the server

diff --git a/src/assets/branding/favicon-1024.png b/src/assets/branding/favicon-1024.png
diff --git a/src/assets/branding/favicon-512.png b/src/assets/branding/favicon-512.png