Skip to content

Commit

Permalink
Feature/dev proxy (#1198)
Browse files Browse the repository at this point in the history
* configure proxy for development

* move fonts to assets folder to mimic prod

* remove Sentient Font, to be replaced with Questa

* fix font on homepage
  • Loading branch information
danieleguido committed Mar 27, 2024
1 parent 28fe323 commit e01e8b6
Show file tree
Hide file tree
Showing 24 changed files with 277 additions and 249 deletions.
6 changes: 3 additions & 3 deletions .env.development
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
VUE_APP_MIDDLELAYER_API="https://dev.impresso-project.ch"
VUE_APP_MIDDLELAYER_API_PATH="/api"
VUE_APP_MIDDLELAYER_API_SOCKET_PATH="/api/socket.io"
VUE_APP_MIDDLELAYER_API="http://localhost:3030"
VUE_APP_MIDDLELAYER_API_PATH="/"
VUE_APP_MIDDLELAYER_API_SOCKET_PATH="/socket.io"
10 changes: 10 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,22 @@ with `--openssl-legacy-provider` option
NODE_OPTIONS=--openssl-legacy-provider npm install
```

If required, cnfigure Vue proxy to `api` and `socket.io` in `.env.development.local` if needed, do not put any slash at the end of the env variables:

```sh
VUE_APP_MIDDLELAYER_API="https://...."
VUE_APP_MIDDLELAYER_API_PATH="/api"
VUE_APP_MIDDLELAYER_API_SOCKET_PATH="/api/socket.io"
```

FInally run with:


```
NODE_OPTIONS=--openssl-legacy-provider npm start
```


### Use docker stack for development (node v12)

We provide a Dockerfile-dev to streamline node 12 installation with now unsupported modules.
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
87 changes: 49 additions & 38 deletions src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -131,43 +131,43 @@ export default {
@font-face {
font-family: 'Satoshi-Variable';
src: url('/fonts/Satoshi-Variable.woff2') format('woff2'),
url('/fonts/Satoshi-Variable.woff') format('woff'),
url('/fonts/Satoshi-Variable.ttf') format('truetype');
src: url('/assets/fonts/Satoshi-Variable.woff2') format('woff2'),
url('/assets/fonts/Satoshi-Variable.woff') format('woff'),
url('/assets/fonts/Satoshi-Variable.ttf') format('truetype');
font-weight: 300 900;
font-display: swap;
font-style: normal;
}
@font-face {
font-family: 'Satoshi-VariableItalic';
src: url('/fonts/Satoshi-VariableItalic.woff2') format('woff2'),
url('/fonts/Satoshi-VariableItalic.woff') format('woff'),
url('/fonts/Satoshi-VariableItalic.ttf') format('truetype');
src: url('/assets/fonts/Satoshi-VariableItalic.woff2') format('woff2'),
url('/assets/fonts/Satoshi-VariableItalic.woff') format('woff'),
url('/assets/fonts/Satoshi-VariableItalic.ttf') format('truetype');
font-weight: 300 900;
font-display: swap;
font-style: italic;
}
@font-face {
font-family: 'Sentient-Variable';
src: url('/fonts/Sentient-Variable.woff2') format('woff2'),
url('/fonts/Sentient-Variable.woff') format('woff'),
url('/fonts/Sentient-Variable.ttf') format('truetype');
font-weight: 300 900;
font-display: swap;
font-style: normal;
}
// @font-face {
// font-family: 'Sentient-Variable';
// src: url('/assets/fonts/Sentient-Variable.woff2') format('woff2'),
// url('/assets/fonts/Sentient-Variable.woff') format('woff'),
// url('/assets/fonts/Sentient-Variable.ttf') format('truetype');
// font-weight: 300 900;
// font-display: swap;
// font-style: normal;
// }
@font-face {
font-family: 'Sentient-VariableItalic';
src: url('/fonts/Sentient-VariableItalic.woff2') format('woff2'),
url('/fonts/Sentient-VariableItalic.woff') format('woff'),
url('/fonts/Sentient-VariableItalic.ttf') format('truetype');
font-weight: 300 900;
font-display: swap;
font-style: normal;
}
// @font-face {
// font-family: 'Sentient-VariableItalic';
// src: url('/assets/fonts/Sentient-VariableItalic.woff2') format('woff2'),
// url('/assets/fonts/Sentient-VariableItalic.woff') format('woff'),
// url('/assets/fonts/Sentient-VariableItalic.ttf') format('truetype');
// font-weight: 300 900;
// font-display: swap;
// font-style: normal;
// }
$clr-white: #ffffff;
// $clr-dark: #212529;
Expand Down Expand Up @@ -200,21 +200,30 @@ $clr-grey-900: #ddd;
--impresso-border-radius-xl: 30px;
--impresso-font-size-smallcaps: 0.72em;
--impresso-letter-spacing-smallcaps: 0.85px;
--impresso-font-size-smaller: 0.85em;
--impresso-wght-smallcaps: 580;
--clr-white: #ffffff;
--clr-grey-100: #17191c;
--clr-grey-300: #424a52;
--clr-grey-400: #5a6672;
--clr-grey-500: #6e8091;
--clr-grey-600: #8a9aa7;
--clr-grey-700: #a7b6c2;
--clr-grey-800: #c6ccd2;
--clr-grey-900: #ddd;
--clr-grey-100-rgba-20: rgba(23, 25, 28, 0.2);
--clr-grey-300-rgba-20: rgba(66, 74, 82, 0.2);
--clr-grey-400-rgba-20: rgba(90, 102, 114, 0.2);
--clr-grey-800-rgba-20: rgba(198, 204, 210, 0.2);
--clr-grey-900-rgba-20: rgba(221, 221, 221, 0.2);
--clr-white: #f8f8ff;
--clr-white-rgba-20: #ffffff33;
--clr-dark: var(--impresso-color-black);
--clr-grey-100: #3d4146;
--clr-grey-200: #5b5e65;
--clr-grey-300: #84868e;
--clr-grey-400: #a9aab4;
--clr-grey-500: #c2c3cb;
--clr-grey-600: #d4d5e1;
--clr-grey-700: #e1e1ee;
--clr-grey-800: #ececfb;
--clr-grey-900: #f8f8ff;
--clr-grey-100-rgba-20: #464d5333;
--clr-grey-200-rgba-20: #585d6633;
--clr-grey-300-rgba-20: #7c7f8c33;
--clr-grey-400-rgba-20: #a0a1a333;
--clr-grey-500-rgba-20: #b1b2c633;
--clr-grey-600-rgba-20: #c3c4d933;
--clr-grey-700-rgba-20: #d5d5ec33;
--clr-grey-800-rgba-20: #e7e7ff33;
--clr-grey-900-rgba-20: #f8f8ff33;
--spacing-1: 0.25rem;
--spacing-2: 0.5rem;
Expand Down Expand Up @@ -246,6 +255,8 @@ $clr-grey-900: #ddd;
--bs-box-shadow-inset: inset 0 1px 2px rgba(0, 0, 0, 0.075);
--bs-font-size-base: 1rem;
--impresso-font-size-3: 1.75rem;
--impresso-font-size-4: 1.5rem;
}
body {
Expand Down

0 comments on commit e01e8b6

Please sign in to comment.