Skip to content

Commit

Permalink
Fix/remove python deps (#1238)
Browse files Browse the repository at this point in the history
* remove impresso-theme and replace scss files

* Update Dockerfile

* Delete cypress.config.ts

* added missing files and updated command order for better caching

---------

Co-authored-by: Roman Kalyakin <[email protected]>
  • Loading branch information
danieleguido and theorm authored Jun 21, 2024
1 parent 0310031 commit b887cbb
Show file tree
Hide file tree
Showing 43 changed files with 7,273 additions and 1,800 deletions.
2 changes: 1 addition & 1 deletion .storybook/preview.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import pinia from '../src/plugins/pinia'
import { handlers as mswHandlers } from './mswHandlers'

import 'dripicons/webfont/webfont.css'
import 'impresso-theme/dist/css/bootpresso.css'
import './assets/legacy/bootstrap-impresso-theme.css'
import '../src/assets/legacy/bootstrap-vue.css'

/*
Expand Down
17 changes: 8 additions & 9 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,25 +1,24 @@
# 1. build
FROM node:17.9-alpine AS frontend_builder
FROM node:22-alpine AS frontend_builder

ARG GIT_TAG
ARG GIT_BRANCH
ARG GIT_REVISION

WORKDIR /impresso_frontend

RUN apk add --no-cache git build-base python3

ENV NODE_OPTIONS --openssl-legacy-provider

COPY package.json package-lock.json ./
RUN npm install

COPY src ./src
COPY static ./static
COPY public ./public

COPY .eslintrc.cjs .eslintignore .postcssrc.js .babelrc vue.config.js tsconfig.json ./
COPY .env .env.production ./

RUN npm install
COPY .eslintrc.cjs .eslintignore tsconfig.app.json tsconfig.json tsconfig.node.json tsconfig.vitest.json ./
COPY env.d.ts .prettierrc.json index.html ./
COPY vite.config.ts vitest.config.ts ./
COPY .env .env.production ./

ENV PUBLIC_PATH /app/
ENV NODE_ENV production
Expand All @@ -30,7 +29,7 @@ ENV GIT_REVISION=${GIT_REVISION}
RUN npm run build

# 2. copy
FROM busybox
FROM busybox:1.36

WORKDIR /impresso-frontend

Expand Down
8 changes: 0 additions & 8 deletions cypress.config.ts

This file was deleted.

1,886 changes: 144 additions & 1,742 deletions package-lock.json

Large diffs are not rendered by default.

4 changes: 0 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@
"build": "run-p type-check \"build-only {@}\" --",
"preview": "vite preview",
"test:unit": "vitest",
"test:e2e": "start-server-and-test preview http://localhost:4173 'cypress run --e2e'",
"test:e2e:dev": "start-server-and-test 'vite dev --port 4173' http://localhost:4173 'cypress open --e2e'",
"build-only": "vite build",
"build-only-dev": "vite build --mode development",
"type-check": "vue-tsc --build --force",
Expand All @@ -43,7 +41,6 @@
"filepond-plugin-file-validate-size": "2.2.0",
"filepond-plugin-file-validate-type": "1.2.4",
"impresso-jscommons": "github:impresso/impresso-jscommons#v1.4.1",
"impresso-theme": "github:impresso/impresso-theme",
"markdown-it": "12.3.2",
"markdown-it-decorate": "1.2.2",
"mitt": "^3.0.1",
Expand Down Expand Up @@ -87,7 +84,6 @@
"@vue/test-utils": "^2.4.5",
"@vue/tsconfig": "^0.5.1",
"autoprefixer": "10.4.19",
"cypress": "^13.7.2",
"eslint": "^8.57.0",
"eslint-plugin-cypress": "^2.15.1",
"eslint-plugin-storybook": "^0.8.0",
Expand Down
2 changes: 1 addition & 1 deletion src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ export default {
</script>
<style lang="scss">
@import 'impresso-theme/src/scss/variables.sass';
@import 'src/assets/legacy/bootstrap-impresso-theme-variables.scss';
@font-face {
font-family: 'Satoshi-Variable';
Expand Down
60 changes: 60 additions & 0 deletions src/assets/legacy/bootstrap-impresso-theme-variables.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
//
// Colors
//
$clr-bg-primary: #fff;
$clr-bg-secondary: darken($clr-bg-primary, 5);

$clr-primary: #111;
$clr-secondary: lighten($clr-primary, 25);
$clr-tertiary: lighten($clr-primary, 60);
$clr-quaternary: lighten($clr-primary, 80);

$clr-accent: #F4D062;
$clr-accent-light: #FFEB78;
$clr-accent-secondary: #56CCF2;

$theme-colors: ( primary: $clr-primary, secondary: $clr-secondary );

// colors with names
$clr-white: #ffffff;
$clr-grey-100: #17191c;
$clr-grey-300: #424a52;
$clr-grey-400: #5a6672;
$clr-grey-800: #c6ccd2;

$link-color: $clr-primary;
$link-hover-color: $clr-primary;
$link-hover-bg: rgba( $clr-accent-secondary, 0.4 );
$link-active-bg: $clr-accent-secondary;
$body-bg: $clr-bg-primary;
$text-color: $clr-primary;
$headings-color: $clr-primary;
$input-focus-border-color: $clr-bg-secondary;

$dropdown-link-active-color: $clr-primary;
$dropdown-link-active-bg: $clr-accent-secondary;
$dropdown-link-hover-color: $clr-primary;
$dropdown-link-hover-bg: rgba( $clr-accent-secondary, 0.4 );

$code-color: darken($clr-accent-secondary, 30);
$code-bg: $clr-bg-secondary;

//
// typography
//
$font-family-serif: 'questa', serif;
$font-family-sans-serif: 'questa-sans',sans-serif;
$headings-font-family: $font-family-serif;
$font-family-base: $font-family-sans-serif;

//
// Misc
//
$enable-rounded: false !default;
$spacer: 1rem;
$enable-caret: true;
$enable-shadows: false;
$enable-gradients: false;
$enable-transitions : true;
$enable-grid-classes: true;
$enable-print-styles: true;
Loading

0 comments on commit b887cbb

Please sign in to comment.