Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
58 commits
Select commit Hold shift + click to select a range
9095046
Phase 1: Swap Bundlers - Webpacker to jsbundling
lodewiges Oct 27, 2025
c47d506
Phase 2: update all javascript
lodewiges Oct 28, 2025
391300e
Fixed a lot of build errors
lodewiges Oct 28, 2025
126e986
FIx code rabbit issues and try to get icons and js working
lodewiges Oct 28, 2025
bceb892
fix more coderabbit issues
lodewiges Oct 28, 2025
c75fe9e
install yarn add @babel/runtime
lodewiges Oct 28, 2025
b27ccc9
Fix more coderabbit issue en get js working
lodewiges Oct 28, 2025
5b533ed
Fix lint
lodewiges Oct 28, 2025
0d710d6
Fix lint part 2
lodewiges Oct 28, 2025
4e44d0c
icon configaration
lodewiges Oct 29, 2025
71e6fd0
Merge branch 'staging' into update/migrateWebpackerToJSBundeling
lodewiges Nov 2, 2025
11df487
Merge branch 'staging' into update/migrateWebpackerToJSBundeling
lodewiges Nov 2, 2025
68d7a75
Update link_to to use Turbo
lodewiges Nov 2, 2025
90b3a07
reinstall sass-lint
lodewiges Nov 2, 2025
272eacb
move all templates to axios
lodewiges Nov 2, 2025
8f603f7
make sass-lint a dev dependency
lodewiges Nov 2, 2025
548e00f
implement axios in all javascript files
lodewiges Nov 2, 2025
8d1eac3
implement code rabbit suggestion
lodewiges Nov 2, 2025
c524ed8
fix lint
lodewiges Nov 2, 2025
d9e67fe
some improvement in sidecase handeling & fix icons
lodewiges Nov 2, 2025
fea24e9
fix errror handleing pricelists
lodewiges Nov 2, 2025
dabc815
implement code rabbit sugestion
lodewiges Nov 2, 2025
b0cafbb
fix csrf issues
lodewiges Nov 2, 2025
fbe619f
fix lint
lodewiges Nov 2, 2025
df29d77
migrateeslint loader to eslint webpacker plugin
lodewiges Nov 2, 2025
7a5b9c9
generate config eslint webpack plugin
lodewiges Nov 2, 2025
79deaea
Migration to postcss-preset-env
lodewiges Nov 2, 2025
d8a48aa
migrate sass-lint to stylelint
lodewiges Nov 2, 2025
0cd15a3
Fix all stylelint errors
lodewiges Nov 3, 2025
6b9f087
improve eslint errors
lodewiges Nov 3, 2025
60366ad
add a code rabbit sugestion
lodewiges Nov 3, 2025
9f3c275
this hopefully solves the eslint error
lodewiges Nov 3, 2025
27c656d
Merge branch 'staging' into update/migrateWebpackerToJSBundeling
lodewiges Nov 3, 2025
b1cf039
improve eslint.config.mjs
lodewiges Nov 3, 2025
dfab8eb
fix icons in vue
lodewiges Nov 3, 2025
5c58837
remove loose mode
lodewiges Nov 3, 2025
508c2af
fix edit order error
lodewiges Nov 3, 2025
ff085d7
fix 2 small issues
lodewiges Nov 3, 2025
572669d
force LF endings
lodewiges Nov 9, 2025
8a42923
change manual factuur sugestion text
lodewiges Nov 12, 2025
2c52590
Merge branch 'staging' into update/migrateWebpackerToJSBundeling
lodewiges Nov 15, 2025
5d7cf07
update yarn.lock
lodewiges Nov 15, 2025
097bc3d
fix order structure
lodewiges Nov 15, 2025
daf6367
remove axios price_list.js
lodewiges Nov 16, 2025
e8af0a0
remove axios user.vue
lodewiges Nov 16, 2025
e437cd2
revert more cahnges pricelist.js
lodewiges Nov 16, 2025
f276172
reintroduce vue csrf tokens
lodewiges Nov 17, 2025
77e65a9
revert to puld way off cors
lodewiges Nov 18, 2025
eab76c9
fix some small bugs
lodewiges Nov 19, 2025
99521b0
change everything to use orignal syntac
lodewiges Nov 19, 2025
d06ebd6
change way to load bootstrap
lodewiges Nov 20, 2025
b7ee84a
lint error
lodewiges Nov 20, 2025
bcfbf3a
remove unneeded change
lodewiges Nov 20, 2025
5afa6ab
fix alot of bugs
lodewiges Nov 21, 2025
a4be573
fix test and lint
lodewiges Nov 21, 2025
2b762ae
small typo fix
lodewiges Nov 21, 2025
d12cb43
Merge branch 'staging' into update/migrateWebpackerToJSBundeling
lodewiges Nov 21, 2025
1f3f528
fix lint errror
lodewiges Nov 21, 2025
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
30 changes: 24 additions & 6 deletions .babelrc
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,32 @@
[
"@babel/preset-env",
{
"useBuiltIns": "entry"
"useBuiltIns": "usage",
"corejs": 3,
"modules": false
}
Comment thread
lodewiges marked this conversation as resolved.
]
],

"plugins": [
"babel-plugin-macros",
"@babel/plugin-syntax-dynamic-import",
"@babel/plugin-syntax-object-rest-spread",
"@babel/plugin-proposal-class-properties"
]
}
"@babel/plugin-proposal-class-properties",
"@babel/plugin-transform-runtime"
],
"env": {
"test": {
"presets": [
[
"@babel/preset-env",
{
"targets": { "node": "current" },
"modules": "commonjs"
}
]
],
"plugins": [
"babel-plugin-dynamic-import-node"
]
}
}
}
4 changes: 3 additions & 1 deletion .browserslistrc
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
defaults
> 0.2%
not dead
not op_mini all
31 changes: 0 additions & 31 deletions .eslintrc.json

This file was deleted.

11 changes: 3 additions & 8 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -37,19 +37,14 @@ yarn-error\.log
/node_modules
yarn-debug.log*
.yarn-integrity
/app/assets/builds/*
!/app/assets/builds/.keep

# Ignore master key for decrypting credentials and more.
/config/master.key

/public/packs
/public/packs-test
/node_modules
/yarn-error.log
yarn-debug.log*
.yarn-integrity

# Ignore Jetbrains IDE files
/.idea

# Ignore gemini-Cli files
gemini.md
gemini.md
3 changes: 0 additions & 3 deletions .postcssrc.yml

This file was deleted.

29 changes: 0 additions & 29 deletions .sass-lint.yml

This file was deleted.

4 changes: 0 additions & 4 deletions .slim-lint.yml

This file was deleted.

17 changes: 17 additions & 0 deletions .stylelintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"extends": [
"stylelint-config-standard-scss",
"stylelint-config-recess-order"
],
"rules": {
"selector-no-qualifying-type": [true, {
"ignore" : ["attribute", "class", "id"]
}]
},
"overrides": [
{
"files": ["**/*.vue"],
"customSyntax": "postcss-html"
}
]
}
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ RUN apt-get update -qq && \
libyaml-dev

# Add Node, required for asset pipeline.
RUN curl -sL https://deb.nodesource.com/setup_16.x | bash - && \
RUN curl -sL https://deb.nodesource.com/setup_18.x | bash - && \
apt-get install -y nodejs && \
npm install -q -g yarn

Expand Down
9 changes: 5 additions & 4 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,16 @@ source 'https://rubygems.org'
gem 'bcrypt', '~> 3.1.20'
gem 'bootsnap', '~> 1.18.6'
gem 'browser', '~> 6.2.0'
gem 'cssbundling-rails', '~> 1.4'
gem 'dartsass-rails', '~> 0.5.1'
gem 'devise', '~>4.9.4'
gem 'devise-i18n', '~>1.15.0'
gem 'factory_bot_rails', '~> 6.5.1'
gem 'faker', '~> 3.5.2'
gem 'font-awesome-rails', '~> 4.7.0.9'
gem 'http', '~> 5.3.1'
gem 'jbuilder', '~> 2.14.1'
gem 'jquery-rails', '~> 4.6.1'
gem 'jsbundling-rails', '~> 1.3'
gem 'kaminari', '~> 1.2.2'
gem 'mollie-api-ruby', '~> 4.18.0'
gem 'net-imap', '~> 0.5.12'
Expand All @@ -29,17 +31,16 @@ gem 'rails', '~> 7.2.3'
gem 'rails-i18n', '~> 7.0.10'
gem 'redis-rails', '~> 5.0.2'
gem 'rest-client', '~> 2.1.0'
gem 'sassc-rails', '~> 2.1.2'
gem 'sentry-rails', '~> 5.28', '>= 5.28.1'
gem 'sentry-ruby', '~> 5.28', '>= 5.28.1'
gem 'sentry-sidekiq', '~> 5.28', '>= 5.28.1'
gem 'sidekiq', '~> 8.0.9'
gem 'sidekiq-scheduler', '~> 6.0.1'
gem 'simple_form', '~> 5.4.0'
gem 'turbolinks', '~> 5.2.1'
gem 'sprockets-rails', '~> 3.5'
gem 'turbo-rails', '~> 2.0'
gem 'uglifier', '~> 4.2.1'
gem 'validates_timeliness', '~> 7.1.0'
gem 'webpacker', '~> 5.4.4'
gem 'wicked_pdf', '~> 2.8.2'
gem 'wkhtmltopdf-binary', '~> 0.12.6.10'

Expand Down
47 changes: 20 additions & 27 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,11 @@ GEM
concurrent-ruby (1.3.5)
connection_pool (2.5.4)
crass (1.0.6)
cssbundling-rails (1.4.3)
railties (>= 6.0.0)
dartsass-rails (0.5.1)
railties (>= 6.0.0)
sass-embedded (~> 1.63)
database_consistency (2.0.7)
activerecord (>= 3.2)
date (3.4.1)
Expand Down Expand Up @@ -158,13 +163,10 @@ GEM
logger
faraday-net_http (3.4.1)
net-http (>= 0.5.0)
ffi (1.17.2)
ffi (1.17.2-x86_64-linux-gnu)
ffi-compiler (1.3.2)
ffi (>= 1.15.5)
rake
font-awesome-rails (4.7.0.9)
railties (>= 3.2, < 9.0)
foreman (0.90.0)
thor (~> 1.4)
formatador (1.2.1)
Expand All @@ -174,6 +176,9 @@ GEM
raabro (~> 1.4)
globalid (1.3.0)
activesupport (>= 6.1)
google-protobuf (4.33.0-x86_64-linux-gnu)
bigdecimal
rake (>= 13)
guard (2.19.1)
formatador (>= 0.2.4)
listen (>= 2.7, < 4.0)
Expand Down Expand Up @@ -220,6 +225,8 @@ GEM
rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
jsbundling-rails (1.3.1)
railties (>= 6.0.0)
json (2.15.2)
jwt (3.1.2)
base64
Expand Down Expand Up @@ -355,8 +362,6 @@ GEM
base64 (>= 0.1.0)
logger (>= 1.6.0)
rack (>= 3.0.0, < 4)
rack-proxy (0.7.7)
rack
rack-session (2.1.1)
base64 (>= 0.1.0)
rack (>= 3.0.0)
Expand Down Expand Up @@ -504,16 +509,9 @@ GEM
ruby-progressbar (1.13.0)
rufus-scheduler (3.9.2)
fugit (~> 1.1, >= 1.11.1)
sassc (2.4.0)
ffi (~> 1.9)
sassc-rails (2.1.2)
railties (>= 4.0.0)
sassc (>= 2.0)
sprockets (> 3.0)
sprockets-rails
tilt
sass-embedded (1.93.2-x86_64-linux-gnu)
google-protobuf (~> 4.31)
securerandom (0.4.1)
semantic_range (3.1.0)
sentry-rails (5.28.1)
railties (>= 5.0)
sentry-ruby (~> 5.28.1)
Expand Down Expand Up @@ -570,14 +568,13 @@ GEM
stringio (3.1.7)
terminal-notifier-guard (1.7.0)
thor (1.4.0)
tilt (2.6.1)
timecop (0.9.10)
timeliness (0.5.3)
timeout (0.4.4)
tsort (0.2.0)
turbolinks (5.2.1)
turbolinks-source (~> 5.2)
turbolinks-source (5.2.0)
turbo-rails (2.0.17)
actionpack (>= 7.1.0)
railties (>= 7.1.0)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
uglifier (4.2.1)
Expand All @@ -599,11 +596,6 @@ GEM
activemodel (>= 6.0.0)
bindex (>= 0.4.0)
railties (>= 6.0.0)
webpacker (5.4.4)
activesupport (>= 5.2)
rack-proxy (>= 0.6.1)
railties (>= 5.2)
semantic_range (>= 2.3.0)
websocket-driver (0.8.0)
base64
websocket-extensions (>= 0.1.0)
Expand All @@ -627,19 +619,21 @@ DEPENDENCIES
bullet (~> 8.1)
capistrano-sidekiq (~> 3.2.0)
colorize (~> 1.1.0)
cssbundling-rails (~> 1.4)
dartsass-rails (~> 0.5.1)
database_consistency (~> 2.0.7)
devise (~> 4.9.4)
devise-i18n (~> 1.15.0)
dotenv-rails (~> 3.1.8)
factory_bot_rails (~> 6.5.1)
faker (~> 3.5.2)
font-awesome-rails (~> 4.7.0.9)
foreman (~> 0.90.0)
guard-livereload (~> 2.5.2)
guard-rspec (~> 4.7.3)
http (~> 5.3.1)
jbuilder (~> 2.14.1)
jquery-rails (~> 4.6.1)
jsbundling-rails (~> 1.3)
kaminari (~> 1.2.2)
listen (~> 3.9.0)
mina (~> 1.2.5)
Expand Down Expand Up @@ -671,7 +665,6 @@ DEPENDENCIES
rubocop-rails (~> 2.33, >= 2.33.4)
rubocop-rspec (~> 3.7)
rubocop-rspec_rails (~> 2.31)
sassc-rails (~> 2.1.2)
sentry-rails (~> 5.28, >= 5.28.1)
sentry-ruby (~> 5.28, >= 5.28.1)
sentry-sidekiq (~> 5.28, >= 5.28.1)
Expand All @@ -683,14 +676,14 @@ DEPENDENCIES
spring (~> 4.4.0)
spring-commands-rspec (~> 1.0.4)
spring-watcher-listen (~> 2.1.0)
sprockets-rails (~> 3.5)
terminal-notifier-guard (~> 1.7.0)
timecop (~> 0.9.10)
turbolinks (~> 5.2.1)
turbo-rails (~> 2.0)
tzinfo-data
uglifier (~> 4.2.1)
validates_timeliness (~> 7.1.0)
web-console (~> 4.2.1)
webpacker (~> 5.4.4)
wicked_pdf (~> 2.8.2)
wkhtmltopdf-binary (~> 0.12.6.10)

Expand Down
3 changes: 3 additions & 0 deletions Procfile.dev
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
web: env RUBY_DEBUG_OPEN=true bin/rails server -b 0.0.0.0
js: NODE_ENV=development yarn watch
css: yarn build:css --watch
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Alpha SOFIA
[![Continuous Delivery](https://github.com/csvalpha/sofia/actions/workflows/continuous-delivery.yml/badge.svg)](https://github.com/csvalpha/sofia/actions/workflows/continuous-delivery.yml)
[![codecov](https://codecov.io/github/csvalpha/sofia/graph/badge.svg?token=RGR5PARLD5)](https://codecov.io/github/csvalpha/sofia)

The source code belonging to Alpha SOFIA. It is a system built with Ruby on Rails with Turbolinks and a little VueJS, used to manage orders in our own bar "Flux". Users authenticate via OAuth API (currently "Alpha AMBER") or through the builtin login portal to see how much credit they got left, or to be able to register new orders and/or payments.
The source code belonging to Alpha SOFIA. It is a system built with Ruby on Rails with Turbo and a little VueJS, used to manage orders in our own bar "Flux". Users authenticate via OAuth API (currently "Alpha AMBER") or through the built-in login portal to see how much credit they have left, or to register new orders and/or payments.

Use this repository to build upon, use as-is, learn from it, prove a point or whatever 😏

Expand Down
Empty file added app/assets/builds/.keep
Empty file.
3 changes: 1 addition & 2 deletions app/assets/config/manifest.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
//= link_tree ../images
//= link_directory ../javascripts .js
//= link_directory ../stylesheets .css
//= link_tree ../builds
Loading
Loading