Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge branch 'develop' into main #29

Merged
merged 10 commits into from
Mar 15, 2024
Merged

Merge branch 'develop' into main #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
a8e2b2e
build: Change build process to use vite
Mar 12, 2024
c42cb8b
build: Update NX and Three JS to most recent versions
Mar 13, 2024
2d6c297
build: Update vite dependencies
Mar 13, 2024
b0116ed
feat: Adjust styling variables to allow for more control
Mar 13, 2024
2f44523
ci: Fix linting error concerning package version of internal libs
Mar 13, 2024
9ddcbc4
refactor: Style highlight headlines
Mar 13, 2024
51e7008
Merge pull request #28 from alchemisten/feature/styling-options
vspdi Mar 15, 2024
c083986
fix: use regex wildcards for external modules which have deep imports…
vspdi Mar 15, 2024
30a59aa
fix: use regex wildcards for external modules which have deep imports…
Mar 15, 2024
c7cec6f
fix: Update package-lock.json
Mar 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions apps/3d-studio-example/project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
}
Expand Down
24 changes: 23 additions & 1 deletion apps/3d-studio-example/vite.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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: {
Expand All @@ -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: {
Expand All @@ -27,6 +44,11 @@ export default defineConfig({
// },

test: {
reporters: ['default'],
coverage: {
reportsDirectory: '../../coverage/apps/3d-studio-example',
provider: 'v8',
},
globals: true,
cache: {
dir: '../../.vitest',
Expand Down
8 changes: 2 additions & 6 deletions libs/gltf-extension-validator/project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
},
Expand Down
8 changes: 2 additions & 6 deletions libs/gltf-extension/project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
},
Expand Down
7 changes: 3 additions & 4 deletions libs/react-website/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
{
"name": "@schablone/3d-studio-react-website",
"version": "0.0.1",
"main": "./index.js",
"types": "./index.d.ts",
"exports": {
Expand All @@ -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"
}
Expand Down
14 changes: 2 additions & 12 deletions libs/react-website/project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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"
}
}
}
Expand Down
8 changes: 5 additions & 3 deletions libs/react-website/src/components/embed-builder/embed-builder.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions libs/react-website/src/components/loading-screen/loading-screen.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down
3 changes: 2 additions & 1 deletion libs/react-website/src/components/page-header/page-header.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -41,6 +41,7 @@

.headline {
font-size: 30px;
font-weight: var(--headline-font-weight);
}


Expand Down
23 changes: 12 additions & 11 deletions libs/react-website/src/components/project-preview/project-preview.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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%;
Expand Down Expand Up @@ -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 {
Expand All @@ -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);
}
}
8 changes: 4 additions & 4 deletions libs/react-website/src/components/settings-button/settings-button.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
4 changes: 2 additions & 2 deletions libs/react-website/src/styles/common.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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);
Expand Down
3 changes: 2 additions & 1 deletion libs/react-website/src/styles/forms.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
3 changes: 2 additions & 1 deletion libs/react-website/src/styles/tags.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
25 changes: 21 additions & 4 deletions libs/react-website/src/styles/variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
}
Expand Down
1 change: 1 addition & 0 deletions libs/react-website/src/views/overview/overview.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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);
Expand Down
Loading
Loading