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.

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

Super Spina Upgrade #78

Open
wants to merge 73 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
73 commits
Select commit Hold shift + click to select a range
4bca39c
Tailwind refactor
Bramjetten Nov 23, 2021
0420d68
Refactor
Bramjetten Nov 23, 2021
550873d
Refactor
Bramjetten Nov 23, 2021
454a566
Refactor filters
Bramjetten Dec 17, 2021
4032e1c
Refactor
Bramjetten Dec 17, 2021
c35d429
Order
Bramjetten Dec 17, 2021
e3483d4
infinite scroll
Bramjetten Dec 17, 2021
9b1068b
Busbikers
Bramjetten Dec 17, 2021
3b71ed8
Order
Bramjetten Dec 17, 2021
72134d2
Order
Bramjetten Dec 17, 2021
56d3708
Nieuw
Bramjetten Dec 17, 2021
a10eb73
Busbiker trekhaken
Bramjetten Dec 17, 2021
3547523
Custom tailwind 3 build
Bramjetten Dec 23, 2021
f43ecaa
Explicit
Bramjetten Dec 23, 2021
9a6f958
Cache order
Bramjetten Dec 23, 2021
fb767b5
Regular datestamp
Bramjetten Jan 21, 2022
88f8aba
Merge branch 'master' into refactoroverview
Bramjetten Jan 21, 2022
d0e6f33
Merge branch 'master' into refactoroverview
Bramjetten Jan 21, 2022
fdf5ff5
Merge branch 'master' into refactoroverview
Bramjetten Jan 21, 2022
0184623
Merge branch 'master' into refactoroverview
Bramjetten Jan 21, 2022
938850f
Merge branch 'master' into refactoroverview
Bramjetten Jan 21, 2022
4e3cdb7
Merge branch 'master' into refactoroverview
Bramjetten Jan 21, 2022
696c305
Index view
Bramjetten Jan 21, 2022
b9d4cd6
Merge branch 'master' into refactoroverview
Bramjetten Jan 21, 2022
4997518
Merge branch 'master' into refactoroverview
Bramjetten Jan 21, 2022
4824b19
Merge branch 'master' into refactoroverview
Bramjetten Jan 21, 2022
d06953c
Refactor overview
Bramjetten Jan 21, 2022
7516842
Order index
Bramjetten Jan 22, 2022
06113d5
Overview refactor
Bramjetten Jan 28, 2022
1a3b1e4
Tailwind no modal
Bramjetten Feb 8, 2022
c3b2caa
Commit die shit
Bramjetten Feb 15, 2022
6c78db1
Spina upgrade
Bramjetten Feb 15, 2022
7e56405
Spina upgrade modals old style
Bramjetten Feb 15, 2022
1c46890
Spina upgrade
Bramjetten Feb 15, 2022
7847626
Layout
Bramjetten Feb 15, 2022
97656cb
Layout fix Spina
Bramjetten Feb 15, 2022
7701888
Indeling rapportages
Bramjetten Feb 15, 2022
1646613
Bigdecimal.new refactor
Bramjetten Mar 1, 2022
4d805af
Fuck oude javascript
Bramjetten Mar 8, 2022
f34d97a
Add search
Bramjetten Mar 8, 2022
d841c73
Remove confirm delete
Bramjetten Mar 15, 2022
146f54b
Products
Bramjetten Apr 1, 2022
83d0b05
Auth
Bramjetten Apr 5, 2022
8a45073
App job
Bramjetten Apr 5, 2022
e3864e2
Turbo load
Bramjetten Apr 5, 2022
50b8f68
Infinite scroll
Bramjetten Apr 5, 2022
39d48d0
Count
Bramjetten Apr 5, 2022
6d05d45
Discounts controller
Bramjetten Apr 5, 2022
1e94dbc
Product search
Bramjetten Apr 5, 2022
2a66f44
Stock level
Bramjetten Apr 5, 2022
49e203e
No archive
Bramjetten Apr 5, 2022
1b30623
product archive
Bramjetten Apr 5, 2022
f5d8878
last logged in
Bramjetten Apr 7, 2022
eb6fe70
Product select
Bramjetten Apr 26, 2022
9584e7e
Attachment
Bramjetten May 31, 2022
06c5fbe
Fix 250
Bramjetten Jul 22, 2022
3c116ea
Refactor overview filters
Bramjetten Nov 2, 2022
f471c92
MERGE
Bramjetten Nov 2, 2022
f7853e6
Merge pull request #77 from SpinaCMS/refactoroverviewmerging
Bramjetten Nov 2, 2022
67e58d5
Fix wat kleine dingetjes
Bramjetten Nov 2, 2022
84f328d
Filter button
Bramjetten Nov 4, 2022
a7becfa
Order bekijken
Bramjetten Nov 4, 2022
1303688
Order show
Bramjetten Nov 4, 2022
fb5b2c3
Notitie
Bramjetten Nov 4, 2022
72359c2
Kaartje Google Maps
Bramjetten Nov 4, 2022
6daefb3
Delivery
Bramjetten Nov 4, 2022
8eb2cbb
Show
Bramjetten Nov 4, 2022
e744120
Lol
Bramjetten Nov 4, 2022
2da99dc
Order show
Bramjetten Nov 4, 2022
4236ed7
Order show
Bramjetten Nov 4, 2022
46741ec
Order show
Bramjetten Nov 4, 2022
dda9a1a
line height
Bramjetten Nov 4, 2022
d3d0297
Spina shop
Bramjetten Nov 9, 2022
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
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,6 @@ test/dummy/log/*.log
test/dummy/tmp/
*/.DS_Store
.DS_Store
.env
.env
node_modules/*
node_modules
143 changes: 63 additions & 80 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,9 @@ PATH
simple_xlsx_writer
spina
statesman
tailwindcss-rails
valvat
view_component
zip-zip

GEM
Expand Down Expand Up @@ -85,12 +87,16 @@ GEM
akami (1.3.1)
gyoku (>= 0.4.0)
nokogiri
ancestry (4.0.0)
activerecord (>= 5.2.4.5)
ancestry (4.1.0)
activerecord (>= 5.2.6)
ansi (1.5.0)
attr_json (1.4.0)
activerecord (>= 5.0.0, < 7.1)
babosa (2.0.0)
bcrypt (3.1.16)
breadcrumbs_on_rails (4.1.0)
railties (>= 5.0)
browser (5.3.1)
builder (3.2.4)
capybara (3.34.0)
addressable
Expand All @@ -103,32 +109,23 @@ GEM
childprocess (3.0.0)
chunky_png (1.4.0)
coderay (1.1.3)
coffee-rails (5.0.0)
coffee-script (>= 2.2.0)
railties (>= 5.2.0)
coffee-script (2.4.1)
coffee-script-source
execjs
coffee-script-source (1.12.2)
concurrent-ruby (1.1.7)
crass (1.0.6)
css_parser (1.7.1)
css_parser (1.11.0)
addressable
delocalize (1.2.0)
rails (>= 2)
descriptive_statistics (2.5.1)
email_validator (2.2.2)
email_validator (2.2.3)
activemodel
erubi (1.10.0)
erubis (2.7.0)
execjs (2.7.0)
factory_bot (6.1.0)
activesupport (>= 5.0.0)
fast_xs (0.8.0)
ffi (1.15.5)
formatador (0.2.5)
globalid (0.4.2)
activesupport (>= 4.2.0)
globalid (1.0.0)
activesupport (>= 5.0)
guard (2.16.2)
formatador (>= 0.2.4)
listen (>= 2.7, < 4.0)
Expand All @@ -144,35 +141,22 @@ GEM
minitest (>= 3.0)
gyoku (1.3.1)
builder (>= 2.1.2)
haml (5.2.1)
temple (>= 0.8.0)
tilt
haml-rails (2.0.1)
actionpack (>= 5.1)
activesupport (>= 5.1)
haml (>= 4.0.6, < 6.0)
html2haml (>= 1.0.1)
railties (>= 5.1)
html2haml (2.2.0)
erubis (~> 2.7.0)
haml (>= 4.0, < 6)
nokogiri (>= 1.6.0)
ruby_parser (~> 3.5)
httpi (2.4.5)
httpi (2.5.0)
rack
socksify
i18n (1.8.5)
concurrent-ruby (~> 1.0)
jbuilder (2.11.2)
image_processing (1.12.1)
mini_magick (>= 4.9.5, < 5)
ruby-vips (>= 2.0.17, < 3)
importmap-rails (1.0.1)
actionpack (>= 6.0.0)
railties (>= 6.0.0)
jbuilder (2.11.5)
actionview (>= 5.0.0)
activesupport (>= 5.0.0)
jquery-rails (4.4.0)
rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
jsonb_accessor (1.1.0)
activerecord (>= 5.0)
activesupport (>= 5.0)
pg (>= 0.18.1)
jsonapi-serializer (2.2.0)
activesupport (>= 4.2)
kaminari (1.2.1)
activesupport (>= 4.1.0)
kaminari-actionview (= 1.2.1)
Expand Down Expand Up @@ -209,7 +193,7 @@ GEM
builder
minitest (>= 5.0)
ruby-progressbar
mobility (1.1.2)
mobility (1.2.5)
i18n (>= 0.6.10, < 2)
request_store (~> 1.0)
nenv (0.3.0)
Expand All @@ -229,9 +213,10 @@ GEM
prawn (2.4.0)
pdf-core (~> 0.9.0)
ttfunk (~> 1.7)
prawn-svg (0.31.0)
prawn-svg (0.32.0)
css_parser (~> 1.6)
prawn (>= 0.11.1, < 3)
rexml (~> 3.2)
prawn-table (0.2.2)
prawn (>= 1.3.0, < 3.0.0)
pry (0.13.1)
Expand Down Expand Up @@ -271,8 +256,8 @@ GEM
method_source
rake (>= 0.8.7)
thor (>= 0.20.3, < 2.0)
rake (13.0.3)
ransack (2.4.1)
rake (13.0.6)
ransack (2.4.2)
activerecord (>= 5.2.4)
activesupport (>= 5.2.4)
i18n
Expand All @@ -282,25 +267,16 @@ GEM
regexp_parser (1.8.2)
request_store (1.5.0)
rack (>= 1.4)
rqrcode (1.2.0)
rexml (3.2.5)
rqrcode (2.1.0)
chunky_png (~> 1.0)
rqrcode_core (~> 0.2)
rqrcode_core (0.2.0)
ruby-measurement (1.2.3)
rqrcode_core (~> 1.0)
rqrcode_core (1.2.0)
ruby-measurement (1.3.0)
ruby-progressbar (1.10.1)
ruby_parser (3.15.1)
sexp_processor (~> 4.9)
ruby-vips (2.1.4)
ffi (~> 1.12)
rubyzip (2.3.0)
sass-rails (6.0.0)
sassc-rails (~> 2.1, >= 2.1.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
savon (2.12.1)
akami (~> 1.2)
builder (>= 2.1.2)
Expand All @@ -312,48 +288,55 @@ GEM
selenium-webdriver (3.142.7)
childprocess (>= 0.5, < 4.0)
rubyzip (>= 1.2.2)
sexp_processor (4.15.2)
shellany (0.0.1)
simple_xlsx_writer (0.5.3)
fast_xs (>= 0.7.3)
rubyzip (>= 0.9.4)
socksify (1.7.1)
spina (1.2.0)
spina (2.7.0)
ancestry
attr_json
babosa
bcrypt
breadcrumbs_on_rails
coffee-rails
haml-rails
jquery-rails
jsonb_accessor (>= 1.0.0)
browser
image_processing
importmap-rails (>= 0.7.6)
jsonapi-serializer
kaminari
mini_magick
mobility (>= 0.8.9)
mobility (>= 1.1.3)
pg
rack-rewrite (>= 1.5.0)
rails (>= 5.2)
sass-rails
turbolinks (~> 5)
rails (>= 6.0)
sprockets-rails
stimulus-rails (>= 0.7.0)
turbo-rails (>= 0.9, < 2.0)
view_component (~> 2.32)
sprockets (4.0.2)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
sprockets-rails (3.2.2)
actionpack (>= 4.0)
activesupport (>= 4.0)
sprockets-rails (3.4.2)
actionpack (>= 5.2)
activesupport (>= 5.2)
sprockets (>= 3.0.0)
statesman (8.0.0)
temple (0.8.2)
statesman (9.0.0)
stimulus-rails (1.0.2)
railties (>= 6.0.0)
tailwindcss-rails (2.0.2)
railties (>= 6.0.0)
thor (1.0.1)
thread_safe (0.3.6)
tilt (2.0.10)
ttfunk (1.7.0)
turbolinks (5.2.1)
turbolinks-source (~> 5.2)
turbolinks-source (5.2.0)
turbo-rails (1.0.0)
actionpack (>= 6.0.0)
railties (>= 6.0.0)
tzinfo (1.2.8)
thread_safe (~> 0.1)
valvat (1.0.1)
valvat (1.1.2)
savon (>= 2.3.0)
view_component (2.47.0)
activesupport (>= 5.0.0, < 8.0)
method_source (~> 1.0)
wasabi (3.6.1)
addressable
httpi (~> 2.0)
Expand Down
1 change: 1 addition & 0 deletions app/assets/config/spina_shop_manifest.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
//= link_directory ../fonts/spina
Binary file added app/assets/fonts/spina/ics_spina.eot
Binary file not shown.
Loading