Skip to content

Commit

Permalink
Update config with last Vite/Yarn/Node versions
Browse files Browse the repository at this point in the history
  • Loading branch information
JohanLopes committed Sep 27, 2024
1 parent e5a1a2b commit 4daf504
Show file tree
Hide file tree
Showing 22 changed files with 937 additions and 1,220 deletions.
9 changes: 9 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
root = true

[*]
charset = utf-8
indent_style = space
indent_size = 2
end_of_line = lf
insert_final_newline = true
max_line_length = 150
4 changes: 4 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
/.yarn/** linguist-vendored
/.yarn/releases/* binary
/.yarn/plugins/**/* binary
/.pnp.* binary linguist-generated
9 changes: 9 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,12 @@ coverage
*.sw?

*.tsbuildinfo

# Yarn
.pnp.*
.yarn/*
!.yarn/patches
!.yarn/plugins
!.yarn/releases
!.yarn/sdks
!.yarn/versions
4 changes: 1 addition & 3 deletions .prettierrc.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
{
"$schema": "https://json.schemastore.org/prettierrc",
"semi": false,
"tabWidth": 2,
"singleQuote": true,
"printWidth": 100,
"trailingComma": "none"
}
}
32 changes: 16 additions & 16 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,36 +4,36 @@
"private": true,
"type": "module",
"scripts": {
"dev": "vite",
"dev": "vite --open",
"build": "vite build",
"preview": "vite preview",
"lint": "eslint . --ext .vue,.js,.jsx,.cjs,.mjs --fix --ignore-path .gitignore",
"format": "prettier --write src/"
},
"dependencies": {
"@fortawesome/fontawesome-free": "^6.5.2",
"@fortawesome/fontawesome-free": "^6.6.0",
"@modyfi/vite-plugin-yaml": "^1.1.0",
"@popperjs/core": "^2.11.8",
"bootstrap": "^5.3.3",
"js-yaml-loader": "^1.2.2",
"marked": "^13.0.1",
"vue": "^3.4.29",
"vue-router": "^4.3.3"
"marked": "^14.1.2",
"vue": "^3.5.9",
"vue-router": "^4.4.5"
},
"devDependencies": {
"@rushstack/eslint-patch": "^1.8.0",
"@vitejs/plugin-vue": "^5.0.5",
"@rushstack/eslint-patch": "^1.10.4",
"@vitejs/plugin-vue": "^5.1.4",
"@vue/eslint-config-prettier": "^9.0.0",
"eslint": "^9.5.0",
"eslint-plugin-vue": "^9.26.0",
"prettier": "^3.3.2",
"sass": "^1.77.6",
"vite": "^5.3.1",
"vite-plugin-vue-devtools": "^7.3.1"
"eslint": "^9.11.1",
"eslint-plugin-vue": "^9.28.0",
"prettier": "^3.3.3",
"sass": "^1.79.3",
"vite": "^5.4.8",
"vite-plugin-vue-devtools": "^7.4.6"
},
"volta": {
"node": "22.3.0",
"npm": "10.8.1"
"node": "22.9.0",
"yarn": "4.5.0"
},
"packageManager": "yarn@4.3.1"
"packageManager": "yarn@4.5.0"
}
4 changes: 0 additions & 4 deletions src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,3 @@
import TopBar from '@/components/TopBar.vue'
import BottomBar from '@/components/BottomBar.vue'
</script>

<style lang="scss">
@import '@/assets/scss/app.scss';
</style>
3 changes: 1 addition & 2 deletions src/assets/datas/projects.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,7 @@
title: WiiSmile
pitch: Le comité d'entreprise externalisé pour TPE & PME
url: 'https://monentreprise.wiismile.fr'
technologies:
[Symfony 5, Doctrine, VueJs, Bootstrap, Elasticsearch, Api REST, Architecture hexagonale]
technologies: [Symfony 5, Doctrine, VueJs, Bootstrap, Elasticsearch, Api REST, Architecture hexagonale]
description: |
Créée en 2001 et forte de ses 130 collaborateurs à ce jour, la société WiiSmile a l'ambition de **permettre à
toute TPE/PME de proposer à ses salariés des avantages équivalents à ceux d’un grand groupe.** 💪
Expand Down
4 changes: 0 additions & 4 deletions src/assets/scss/_variables.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
@use 'sass:math';
@import 'bootstrap/scss/functions';

$font-family-base: 'Lato', sans-serif;
$fa-font-path: '@fortawesome/fontawesome-free/webfonts';
Expand Down Expand Up @@ -53,6 +52,3 @@ $navbar-nav-link-padding-x: 1rem;

// Carousel
$carousel-indicator-height: 5px;

@import 'bootstrap/scss/variables';
@import 'bootstrap/scss/variables-dark';
22 changes: 17 additions & 5 deletions src/assets/scss/app.scss
Original file line number Diff line number Diff line change
@@ -1,12 +1,22 @@
// Core variables / function / mixins
@import 'bootstrap/scss/mixins/banner';
@include bsBanner('');

// 1. Include functions first (so you can manipulate colors, SVGs, calc, etc)
@import 'bootstrap/scss/functions';

// 2. Include any default variable overrides here
@import 'variables';
@import 'mixins';

// 3. Include remainder of required Bootstrap stylesheets
@import 'bootstrap/scss/variables';
@import 'bootstrap/scss/variables-dark';
@import 'bootstrap/scss/maps';
@import 'bootstrap/scss/mixins';
@import 'bootstrap/scss/root';

// Bootstrap components
@import 'bootstrap/scss/utilities';

// 4. Bootstrap components
@import 'bootstrap/scss/root';
@import 'bootstrap/scss/reboot';
@import 'bootstrap/scss/type';
@import 'bootstrap/scss/images';
Expand All @@ -29,13 +39,16 @@
//@import "bootstrap/scss/progress";
//@import "bootstrap/scss/list-group";
//@import "bootstrap/scss/close";
//@import "bootstrap/scss/toasts";
//@import "bootstrap/scss/modal";
//@import "bootstrap/scss/tooltip";
//@import "bootstrap/scss/popover";
//@import "bootstrap/scss/carousel";
//@import "bootstrap/scss/spinners";
//@import "bootstrap/scss/offcanvas";
//@import "bootstrap/scss/placeholders";

// Helpers & utilities
@import 'bootstrap/scss/helpers';
@import 'bootstrap/scss/utilities/api';

Expand All @@ -45,7 +58,6 @@
//@import "@fortawesome/fontawesome-free/scss/regular";
@import '@fortawesome/fontawesome-free/scss/brands';

@import 'mixins';
@import 'transitions';
@import 'aside';

Expand Down
Loading

0 comments on commit 4daf504

Please sign in to comment.