Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
2c95018
Bump es5-ext from 0.10.50 to 0.10.64 in /public/swagger-ui
dependabot[bot] Apr 24, 2024
41c7284
Bump express from 4.17.1 to 4.19.2 in /public/swagger-ui
dependabot[bot] Apr 24, 2024
3551234
Bump ip from 1.1.5 to 1.1.9 in /public/swagger-ui
dependabot[bot] Apr 24, 2024
e1a33ce
Bump axios and bundlesize in /public/swagger-ui
dependabot[bot] Apr 24, 2024
b5c7a6f
Bump webpack-dev-middleware and webpack-dev-server in /public/swagger-ui
dependabot[bot] Apr 24, 2024
e1c5e26
Bump follow-redirects and bundlesize in /public/swagger-ui
dependabot[bot] Apr 24, 2024
4091510
Bump tar in /public/swagger-ui
dependabot[bot] Apr 24, 2024
a8edd0c
Bump ejs and nightwatch in /public/swagger-ui
dependabot[bot] May 1, 2024
a9625c3
Bump braces, @babel/cli, webpack, webpack-cli and webpack-dev-server
dependabot[bot] Jun 12, 2024
f86c128
Merge pull request #73 from 1instinct/dependabot/npm_and_yarn/public/…
aaronsmulktis Dec 14, 2025
9388e35
Merge pull request #74 from 1instinct/dependabot/npm_and_yarn/public/…
aaronsmulktis Dec 14, 2025
23561a4
Merge pull request #75 from 1instinct/dependabot/npm_and_yarn/public/…
aaronsmulktis Dec 14, 2025
afd10e2
Merge pull request #76 from 1instinct/dependabot/npm_and_yarn/public/…
aaronsmulktis Dec 14, 2025
d54efa6
Merge branch 'master' into dependabot/npm_and_yarn/public/swagger-ui/…
aaronsmulktis Dec 14, 2025
3a72aac
Merge pull request #77 from 1instinct/dependabot/npm_and_yarn/public/…
aaronsmulktis Dec 14, 2025
0d955ce
Bump node-forge and webpack-dev-server in /public/swagger-ui
dependabot[bot] Dec 14, 2025
8acf8d7
Merge branch 'master' into dependabot/npm_and_yarn/public/swagger-ui/…
aaronsmulktis Dec 14, 2025
3c8ebeb
Merge pull request #78 from 1instinct/dependabot/npm_and_yarn/public/…
aaronsmulktis Dec 14, 2025
32d33d0
Merge pull request #79 from 1instinct/dependabot/npm_and_yarn/public/…
aaronsmulktis Dec 14, 2025
b40df2f
Merge branch 'master' into dependabot/npm_and_yarn/public/swagger-ui/…
aaronsmulktis Dec 14, 2025
4f5826d
Merge pull request #80 from 1instinct/dependabot/npm_and_yarn/public/…
aaronsmulktis Dec 14, 2025
10f0908
Merge branch 'master' into dependabot/npm_and_yarn/public/swagger-ui/…
aaronsmulktis Dec 14, 2025
7daa767
Merge pull request #81 from 1instinct/dependabot/npm_and_yarn/public/…
aaronsmulktis Dec 14, 2025
69a0fe6
update docs
aaronsmulktis Dec 14, 2025
6d14335
Merge branch 'master' of github.com:1instinct/dna-admin
aaronsmulktis Dec 14, 2025
a8b9145
Merge branch 'master' of github.com:1instinct/dna-admin into dependab…
aaronsmulktis Dec 14, 2025
5a3a7ea
Merge pull request #83 from 1instinct/dependabot/npm_and_yarn/public/…
aaronsmulktis Dec 14, 2025
cb4e3de
Changes:
aaronsmulktis Dec 15, 2025
a417d4a
Changes:
aaronsmulktis Jan 2, 2026
edf3ecc
Changes:
aaronsmulktis Jan 2, 2026
1b540c0
Changes
aaronsmulktis Jan 9, 2026
1b09c89
Add product import system
mjfxjas Jan 10, 2026
3c67086
Update setup with tested working command
mjfxjas Jan 10, 2026
1c93d30
Add S3 product import with Active Storage integration
mjfxjas Jan 10, 2026
0f3d5c6
Add .amazonq and yarn.lock to gitignore
mjfxjas Jan 10, 2026
50086b3
Replace lorem ipsum with realistic live stream seed data
mjfxjas Jan 10, 2026
bf30088
Replace lorem ipsum in static pages and menu items
mjfxjas Jan 10, 2026
ea9878c
Merge remote-tracking branch 'origin/@aaron.smulktis/develop' into fe…
mjfxjas Jan 10, 2026
db8bce1
Fix menu item URLs to match frontend routes
mjfxjas Jan 10, 2026
e3ec7a8
Resolve merge conflicts with develop
mjfxjas Jan 10, 2026
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
790 changes: 790 additions & 0 deletions .github/copilot-instructions.md

Large diffs are not rendered by default.

8 changes: 2 additions & 6 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,6 @@ envvars.txt
.env.staging
.env.production
.prettierrc
secret.yml
secret.yaml
secrets.yml
secrets.yaml

.byebug_history
# Ignore precompiled javascript packs
Expand Down Expand Up @@ -90,5 +86,5 @@ secret.yaml
*.tar
*.yml.prod
docker-compose.yml.local

.anima/
.amazonq/
yarn.lock
23 changes: 12 additions & 11 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,17 @@
# https://docs.docker.com/compose/rails/#define-the-project
FROM ruby:2.7.2
# Fix Debian repository URLs for old Buster image
RUN sed -i 's|http://deb.debian.org|http://archive.debian.org|g' /etc/apt/sources.list && \
sed -i 's|http://security.debian.org|http://archive.debian.org|g' /etc/apt/sources.list && \
sed -i '/security.debian.org/d' /etc/apt/sources.list
# The qq is for silent output in the console
RUN apt-get update -qq && apt-get install -y postgresql-client nodejs
RUN apt-get update -qq && apt-get install -y \
build-essential \
libpq-dev \
nodejs \
npm \
curl \
&& rm -rf /var/lib/apt/lists/*

# This is given by the Ruby Image.
# This will be the de-facto directory that
Expand All @@ -20,7 +30,7 @@ COPY Gemfile Gemfile.lock ./
COPY .env.development .env.development

# Install the Gems
RUN gem install bundler:2.2.11
RUN gem install bundler:2.4.13

RUN bundle config set force_ruby_platform true

Expand All @@ -29,16 +39,7 @@ RUN bundle install
COPY . ./

# Precompile assets

# Set environment variables for asset precompilation
# ARG DATABASE_URL=postgresql://postgres:password@db:5432/dna_admin_development
# ENV RAILS_ENV=production

# RUN RAILS_ENV=production bundle exec rake assets:precompile
# RUN RAILS_ENV=development DATABASE_URL=postgresql://postgres:password@db:5432/dna_admin_development bundle exec rake assets:precompile
# COPY wait-for-it.sh /usr/bin/
# RUN chmod +x /usr/bin/wait-for-it.sh
# RUN /usr/bin/wait-for-it.sh db:5432 --timeout=30 --strict -- bundle exec rake assets:precompile

# Add a script to be executed every time the container starts.
COPY entrypoint.sh /usr/bin/
Expand Down
4 changes: 4 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ gem 'pg'
gem 'puma', '~> 4.3'
# Use SCSS for stylesheets
gem 'sass-rails', '~> 5.0'
# Sass engine required by bootstrap
gem 'sassc-rails'
# Use Uglifier as compressor for JavaScript assets
gem 'uglifier', '>= 1.3.0'
# See https://github.com/rails/execjs#readme for more supported runtimes
Expand Down Expand Up @@ -49,6 +51,8 @@ gem 'spree_static_content', github: 'spree-contrib/spree_static_content'
# gem 'spree_digital', github: 'spree-contrib/spree_digital'
gem 'spree_reffiliate', github: '1instinct/spree_reffiliate'
gem 'spree_loyalty_points', github: '1instinct/spree-loyalty-points'
# gem 'spree_avatax_official', github: 'spree-contrib/spree_avatax_official', branch: 'spree-4-1-plus'
# gem 'spree_avatax_official', '~> 1.9.0'

gem 'spree_avatar', github: '1instinct/spree_avatar'
gem 'spree_editor', github: 'spree-contrib/spree_editor'
Expand Down
Loading