Merge pull request #28 from alchemisten/feature/styling-options

Feature/styling options
alchemisten · Mar 15, 2024 · 51e7008 · 51e7008
2 parents 3edcb23 + 9ddcbc4
commit 51e7008
Show file tree

Hide file tree

Showing 30 changed files with 1,929 additions and 1,781 deletions.
diff --git a/apps/3d-studio-example/project.json b/apps/3d-studio-example/project.json
@@ -46,17 +46,13 @@
     },
     "lint": {
       "executor": "@nx/eslint:lint",
-      "outputs": ["{options.outputFile}"],
-      "options": {
-        "lintFilePatterns": ["apps/3d-studio-example/**/*.ts"]
-      }
+      "outputs": ["{options.outputFile}"]
     },
     "test": {
       "executor": "@nx/jest:jest",
       "outputs": ["{workspaceRoot}/coverage/apps/3d-studio-example"],
       "options": {
-        "jestConfig": "apps/3d-studio-example/jest.config.ts",
-        "passWithNoTests": true
+        "jestConfig": "apps/3d-studio-example/jest.config.ts"
       }
     }
   }

diff --git a/apps/3d-studio-example/vite.config.ts b/apps/3d-studio-example/vite.config.ts
@@ -1,8 +1,17 @@
 /// <reference types="vitest" />
+import replaceFiles from '@nx/vite/plugins/rollup-replace-files.plugin';
 import { defineConfig } from 'vite';
 import { nxViteTsPaths } from '@nx/vite/plugins/nx-tsconfig-paths.plugin';
 
 export default defineConfig({
+  root: __dirname,
+  build: {
+    outDir: '../../dist/apps/3d-studio-example',
+    reportCompressedSize: true,
+    commonjsOptions: {
+      transformMixedEsModules: true,
+    },
+  },
   cacheDir: '../../.vite/3d-studio-example',
 
   server: {
@@ -15,7 +24,15 @@ export default defineConfig({
     host: 'localhost',
   },
 
-  plugins: [nxViteTsPaths()],
+  plugins: [
+    nreplaceFiles([
+      {
+        replace: 'apps/3d-studio-example/src/environments/environment.ts',
+        with: 'apps/3d-studio-example/src/environments/environment.prod.ts',
+      },
+    ]),
+    xViteTsPaths(),
+  ],
 
   // Uncomment this if you are using workers.
   // worker: {
@@ -27,6 +44,11 @@ export default defineConfig({
   // },
 
   test: {
+    reporters: ['default'],
+    coverage: {
+      reportsDirectory: '../../coverage/apps/3d-studio-example',
+      provider: 'v8',
+    },
     globals: true,
     cache: {
       dir: '../../.vitest',

diff --git a/libs/gltf-extension-validator/project.json b/libs/gltf-extension-validator/project.json
@@ -28,17 +28,13 @@
     },
     "lint": {
       "executor": "@nx/eslint:lint",
-      "outputs": ["{options.outputFile}"],
-      "options": {
-        "lintFilePatterns": ["libs/gltf-extension-validator/**/*.ts"]
-      }
+      "outputs": ["{options.outputFile}"]
     },
     "test": {
       "executor": "@nx/jest:jest",
       "outputs": ["{workspaceRoot}/coverage/libs/gltf-extension-validator"],
       "options": {
-        "jestConfig": "libs/gltf-extension-validator/jest.config.ts",
-        "passWithNoTests": true
+        "jestConfig": "libs/gltf-extension-validator/jest.config.ts"
       }
     }
   },

diff --git a/libs/gltf-extension/project.json b/libs/gltf-extension/project.json
@@ -28,17 +28,13 @@
     },
     "lint": {
       "executor": "@nx/eslint:lint",
-      "outputs": ["{options.outputFile}"],
-      "options": {
-        "lintFilePatterns": ["libs/gltf-extension/**/*.ts"]
-      }
+      "outputs": ["{options.outputFile}"]
     },
     "test": {
       "executor": "@nx/jest:jest",
       "outputs": ["{workspaceRoot}/coverage/libs/gltf-extension"],
       "options": {
-        "jestConfig": "libs/gltf-extension/jest.config.ts",
-        "passWithNoTests": true
+        "jestConfig": "libs/gltf-extension/jest.config.ts"
       }
     }
   },

diff --git a/libs/react-website/package.json b/libs/react-website/package.json
@@ -1,6 +1,5 @@
 {
   "name": "@schablone/3d-studio-react-website",
-  "version": "0.0.1",
   "main": "./index.js",
   "types": "./index.d.ts",
   "exports": {
@@ -26,9 +25,9 @@
     "rxjs": "^7.8.1"
   },
   "devDependencies": {
-    "@nx/devkit": "17.0.3",
-    "@vitejs/plugin-react": "4.0.0",
-    "vite": "4.3.9",
+    "@nx/devkit": "18.0.8",
+    "@vitejs/plugin-react": "4.2.0",
+    "vite": "5.1.6",
     "vite-plugin-dts": "2.3.0",
     "vite-tsconfig-paths": "^4.2.0"
   }

diff --git a/libs/react-website/project.json b/libs/react-website/project.json
@@ -7,10 +7,7 @@
   "targets": {
     "lint": {
       "executor": "@nx/eslint:lint",
-      "outputs": ["{options.outputFile}"],
-      "options": {
-        "lintFilePatterns": ["libs/react-website/**/*.{ts,tsx,js,jsx}","libs/react-website/package.json","libs/react-website/project.json"]
-      }
+      "outputs": ["{options.outputFile}"]
     },
     "build": {
       "executor": "@nx/vite:build",
@@ -44,14 +41,7 @@
       "executor": "@nx/jest:jest",
       "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
       "options": {
-        "jestConfig": "libs/react-website/jest.config.ts",
-        "passWithNoTests": true
-      },
-      "configurations": {
-        "ci": {
-          "ci": true,
-          "codeCoverage": true
-        }
+        "jestConfig": "libs/react-website/jest.config.ts"
       }
     }
   }

diff --git a/libs/react-website/src/components/embed-builder/embed-builder.module.scss b/libs/react-website/src/components/embed-builder/embed-builder.module.scss
@@ -1,9 +1,9 @@
 @import '../../styles/scss-variables.scss';
 
 .sidebar {
-  background-color: #fff;
+  background-color: var(--color-sidebar-background);
   bottom: 0;
-  box-shadow: 0 0 50px 0 rgba(0,0,0,.25);
+  box-shadow: var(--sidebar-box-shadow);
   box-sizing: border-box;
   left: calc(-1 * var(--sidebar-width));
   overflow-y: auto;
@@ -21,18 +21,20 @@
 
 .headline {
   font-size: 24px;
+  font-weight: var(--headline-font-weight);
   margin: 20px 0;
   text-transform: uppercase;
 }
 
 .subheadline {
   font-size: 19px;
+  font-weight: var(--headline-font-weight);
   margin: 20px 0;
   text-transform: uppercase;
 }
 
 .codeWindow {
-  background: var(--color-gray-light);
+  background: var(--color-code-window-background);
   font-size: 14px;
   margin: 15px 0;
   min-height: 200px;

diff --git a/libs/react-website/src/components/loading-screen/loading-screen.module.scss b/libs/react-website/src/components/loading-screen/loading-screen.module.scss
@@ -30,7 +30,7 @@
 .button {
   background: var(--color-preload-background);
   border-radius: 50%;
-  color: var(--color-button);
+  color: var(--color-button-text);
   height: 80px;
   padding: 16px;
   position: relative;
@@ -49,7 +49,7 @@
 .box {
   background: var(--color-preload-background);
   border-radius: var(--preload-border-radius);
-  color: var(--color-button);
+  color: var(--color-button-text);
   max-width: var(--preload-max-width);
   padding: var(--preload-box-padding);
   position: relative;

diff --git a/libs/react-website/src/components/page-header/page-header.module.scss b/libs/react-website/src/components/page-header/page-header.module.scss
@@ -3,7 +3,7 @@
 .pageHeader {
   align-items: center;
   background: #fff;
-  box-shadow: 0 3px 15px rgba(0,0,0,.2);
+  box-shadow: var(--header-box-shadow);
   box-sizing: border-box;
   display: flex;
   height: var(--header-height);
@@ -41,6 +41,7 @@
 
 .headline {
   font-size: 30px;
+  font-weight: var(--headline-font-weight);
 }
 
 

diff --git a/libs/react-website/src/components/project-preview/project-preview.module.scss b/libs/react-website/src/components/project-preview/project-preview.module.scss
@@ -1,15 +1,15 @@
 .projectPreview {
   --project-preview-title-color: #fff;
 
-  background: #fff;
-  border-radius: 3px;
-  box-shadow: -1px 4px 50px 0 rgba(0,0,0,.5);
+  background: var(--color-preview-background);
+  border-radius: var(--project-preview-border-radius);
+  box-shadow: var(--project-preview-box-shadow);
   overflow: hidden;
   position: relative;
 }
 
 .image {
-  background-color: var(--color-gray);
+  background: var(--project-preview-image-background);
   overflow: hidden;
   position: relative;
   width: 100%;
@@ -42,25 +42,26 @@
 }
 
 .controls {
-  background-color: #fff;
   display: flex;
   height: 80px;
   justify-content: space-between;
   padding: 20px;
 }
 
 .selectButton {
-  background: var(--color-gray-light);
-  border: 8px solid var(--color-gray);
+  background: var(--color-select-button-background);
+  background-clip: var(--select-button-background-clip);
+  border: var(--select-button-border);
   border-radius: 25px;
   height: var(--interaction-height);
   outline: none;
-  padding: 0;
+  padding: var(--select-button-padding);
   transition: background var(--animation-time) opacity var(--animation-time);
   width: var(--interaction-height);
 
   &.selected {
     background: var(--color-interaction-active);
+    background-clip: var(--select-button-background-clip);
   }
 
   &:hover {
@@ -69,11 +70,11 @@
 }
 
 .button {
-  border-radius: 2px;
-  color: var(--color-button);
+  border-radius: var(--project-button-border-radius);
+  color: var(--color-button-text);
 
   &:hover {
     background-color: var(--color-interaction-active);
-    color: var(--color-button);
+    color: var(--color-button-text);
   }
 }
diff --git a/libs/react-website/src/components/settings-button/settings-button.module.scss b/libs/react-website/src/components/settings-button/settings-button.module.scss
@@ -3,18 +3,18 @@
 }
 
 .buttonLeft {
-  border-radius: calc(var(--interaction-height) / 2) 0 0 calc(var(--interaction-height) / 2);
+  border-radius: var(--settings-button-border-radius) 0 0 var(--settings-button-border-radius);
   min-width: 50px;
 }
 
 .buttonCenter {
-  border-left: 1px solid var(--color-button);
+  border-left: 1px solid var(--color-button-text);
   min-width: 50px;
 }
 
 .buttonRight {
-  border-left: 1px solid var(--color-button);
-  border-radius: 0 calc(var(--interaction-height) / 2) calc(var(--interaction-height) / 2) 0;
+  border-left: 1px solid var(--color-button-text);
+  border-radius: 0 var(--settings-button-border-radius) var(--settings-button-border-radius) 0;
   min-width: 50px;
 }
 

diff --git a/libs/react-website/src/styles/common.scss b/libs/react-website/src/styles/common.scss
@@ -1,6 +1,6 @@
 .button {
-  background-color: var(--color-gray);
-  color: var(--color-button);
+  background-color: var(--color-button-background);
+  color: var(--color-button-text);
   display: inline-block;
   font-family: var(--base-font-family);
   font-size: var(--base-font-size);

diff --git a/libs/react-website/src/styles/forms.scss b/libs/react-website/src/styles/forms.scss
@@ -8,8 +8,9 @@
 
 input,
 select {
-  border: 1px solid #000;
+  border: 1px solid var(--base-font-color);
   border-radius: 2px;
+  color: var(--base-font-color);
   font-family: var(--base-font-family);
   font-size: var(--base-font-size);
   height: 30px;

diff --git a/libs/react-website/src/styles/tags.scss b/libs/react-website/src/styles/tags.scss
@@ -15,9 +15,10 @@ body {
 }
 
 body {
+  color: var(--base-font-color);
   font-family: var(--base-font-family);
   font-size: var(--base-font-size);
-  font-weight: 400;
+  font-weight: var(--base-font-weight);
   line-height: var(--base-line-height);
   min-height: 100vh;
   min-width: 320px;

diff --git a/libs/react-website/src/styles/variables.scss b/libs/react-website/src/styles/variables.scss
@@ -1,22 +1,39 @@
 @import './scss-variables.scss';
 
 :root {
-  --color-gray: #a9a9a9;
-  --color-gray-light: #d3d3d3;
+  --color-button-background: #a9a9a9;
+  --color-button-text: #fff;
+  --color-code-window-background: #d3d3d3;
   --color-interaction-active: #003055;
-  --color-button: #fff;
+  --color-overview-background: transparent;
+  --color-preview-background: #fff;
   --color-preload-background: rgba(0, 0, 0, 0.8);
+  --color-select-button-background: #d3d3d3;
+  --color-sidebar-background: #fff;
 
+  --base-font-color: #000;
   --base-font-family: 'Open Sans', Helvetica, Arial, sans-serif;
   --base-font-size: 16px;
+  --base-font-weight: 400;
   --base-line-height: 1.5;
+  --headline-font-weight: 400;
 
+  --header-box-shadow: 0 3px 15px rgba(0,0,0,.2);
   --header-height: 80px;
-  --sidebar-width: 300px;
   --interaction-height: 40px;
   --preload-border-radius: 10px;
   --preload-box-padding: 22px;
   --preload-max-width: 390px;
+  --project-button-border-radius: 2px;
+  --project-preview-border-radius: 3px;
+  --project-preview-box-shadow: -1px 4px 50px 0 rgba(0,0,0,.5);
+  --project-preview-image-background: #a9a9a9;
+  --select-button-border: 8px solid #a9a9a9;
+  --select-button-background-clip: initial;
+  --select-button-padding: 0;
+  --settings-button-border-radius: calc(var(--interaction-height) / 2);
+  --sidebar-box-shadow: 0 0 50px 0 rgba(0,0,0,.25);
+  --sidebar-width: 300px;
 
   --animation-time: 0.3s;
 }

diff --git a/libs/react-website/src/views/overview/overview.module.scss b/libs/react-website/src/views/overview/overview.module.scss
@@ -1,6 +1,7 @@
 @import '../../styles/scss-variables.scss';
 
 .pageContent {
+  background-color: var(--color-overview-background);
   padding-left: 0;
   padding-top: var(--header-height);
   transition: padding-left var(--animation-time);