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

Feature/6 meertalige content #34

Merged
merged 17 commits into from
Feb 14, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ jobs:
python-version: '3.11'
optimize-postgres: 'yes'
pg-service: 'postgres'
setup-node: 'no'
setup-node: 'yes'
apt-packages: 'gettext'

- name: Run tests
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
strategy:
fail-fast: false
matrix:
language: [ 'python' ]
language: [ 'javascript', 'python' ]

steps:
- name: Checkout repository
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@ local.py

# Static files
src/open_producten/static/bundles/
src/open_producten/static/wysimark/wysimark.js
src/open_producten/static/wysimark/index*
src/open_producten/fonts/

tmp/*
162 changes: 162 additions & 0 deletions .jshintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,162 @@
{
// JSHint Default Configuration File (as on JSHint website)
// See http://jshint.com/docs/ for more details

"maxerr": 50,
// {int} Maximum error before stopping

// Enforcing
"bitwise": true,
// true: Prohibit bitwise operators (&, |, ^, etc.)
"camelcase": false,
// true: Identifiers must be in camelCase
"curly": true,
// true: Require {} for every new block or scope
"eqeqeq": true,
// true: Require triple equals (===) for comparison
"forin": true,
// true: Require filtering for..in loops with obj.hasOwnProperty()
"freeze": true,
// true: prohibits overwriting prototypes of native objects such as Array, Date etc.
"immed": false,
// true: Require immediate invocations to be wrapped in parens e.g. `(function () { } ());`
"latedef": false,
// true: Require variables/functions to be defined before being used
"newcap": false,
// true: Require capitalization of all constructor functions e.g. `new F()`
"noarg": true,
// true: Prohibit use of `arguments.caller` and `arguments.callee`
"noempty": true,
// true: Prohibit use of empty blocks
"nonbsp": true,
// true: Prohibit "non-breaking whitespace" characters.
"nonew": false,
// true: Prohibit use of constructors for side-effects (without assignment)
"plusplus": false,
// true: Prohibit use of `++` and `--`
"quotmark": "single",
// Quotation mark consistency:
// false : do nothing (default)
// true : ensure whatever is used is consistent
// "single" : require single quotes
// "double" : require double quotes
"undef": true,
// true: Require all non-global variables to be declared (prevents global leaks)
"unused": true,
// Unused variables:
// true : all variables, last function parameter
// "vars" : all variables only
// "strict" : all variables, all function parameters
"strict": false,
// true: Requires all functions run in ES5 Strict Mode
"maxparams": false,
// {int} Max number of formal params allowed per function
"maxdepth": 3,
// {int} Max depth of nested blocks (within functions)
"maxstatements": false,
// {int} Max number statements per function
"maxcomplexity": false,
// {int} Max cyclomatic complexity per function
"maxlen": false,
// {int} Max number of characters per line
"varstmt": false,
// true: Disallow any var statements. Only `let` and `const` are allowed.

// Relaxing
"asi": false,
// true: Tolerate Automatic Semicolon Insertion (no semicolons)
"boss": false,
// true: Tolerate assignments where comparisons would be expected
"debug": false,
// true: Allow debugger statements e.g. browser breakpoints.
"eqnull": false,
// true: Tolerate use of `== null`
"esversion": 6,
// {int} Specify the ECMAScript version to which the code must adhere.
"moz": false,
// true: Allow Mozilla specific syntax (extends and overrides esnext features)
// (ex: `for each`, multiple try/catch, function expression�)
"evil": false,
// true: Tolerate use of `eval` and `new Function()`
"expr": false,
// true: Tolerate `ExpressionStatement` as Programs
"funcscope": false,
// true: Tolerate defining variables inside control statements
"globalstrict": false,
// true: Allow global "use strict" (also enables 'strict')
"iterator": false,
// true: Tolerate using the `__iterator__` property
"lastsemic": false,
// true: Tolerate omitting a semicolon for the last statement of a 1-line block
"laxbreak": false,
// true: Tolerate possibly unsafe line breakings
"laxcomma": false,
// true: Tolerate comma-first style coding
"loopfunc": false,
// true: Tolerate functions being defined in loops
"multistr": false,
// true: Tolerate multi-line strings
"noyield": false,
// true: Tolerate generator functions with no yield statement in them.
"notypeof": false,
// true: Tolerate invalid typeof operator values
"proto": false,
// true: Tolerate using the `__proto__` property
"scripturl": false,
// true: Tolerate script-targeted URLs
"shadow": false,
// true: Allows re-define variables later in code e.g. `var x=1; x=2;`
"sub": false,
// true: Tolerate using `[]` notation when it can still be expressed in dot notation
"supernew": false,
// true: Tolerate `new function () { ... };` and `new Object;`
"validthis": false,
// true: Tolerate using this in a non-constructor function

// Environments
"browser": true,
// Web Browser (window, document, etc)
"browserify": false,
// Browserify (node.js code in the browser)
"couch": false,
// CouchDB
"devel": true,
// Development/debugging (alert, confirm, etc)
"dojo": false,
// Dojo Toolkit
"jasmine": false,
// Jasmine
"jquery": false,
// jQuery
"mocha": true,
// Mocha
"mootools": false,
// MooTools
"node": true,
// Node.js
"nonstandard": false,
// Widely adopted globals (escape, unescape, etc)
"phantom": false,
// PhantomJS
"prototypejs": false,
// Prototype and Scriptaculous
"qunit": false,
// QUnit
"rhino": false,
// Rhino
"shelljs": false,
// ShellJS
"typed": false,
// Globals for typed array constructions
"worker": false,
// Web Workers
"wsh": false,
// Windows Scripting Host
"yui": false,
// Yahoo User Interface

// Custom Globals
"globals": {
"google": true
}
}
1 change: 1 addition & 0 deletions .nvmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
v20
41 changes: 21 additions & 20 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -26,26 +26,27 @@ RUN pip install -r requirements/production.txt


# Stage 2 - Install frontend deps and build assets
#FROM node:20-bookworm-slim AS frontend-build
#
#RUN apt-get update && apt-get install -y --no-install-recommends \
# git \
# && rm -rf /var/lib/apt/lists/*
#
#WORKDIR /app
#
## copy configuration/build files
FROM node:20-bookworm-slim AS frontend-build

RUN apt-get update && apt-get install -y --no-install-recommends \
git \
&& rm -rf /var/lib/apt/lists/*

WORKDIR /app

# copy configuration/build files
#COPY ./build /app/build/
#COPY ./*.json ./*.js ./.babelrc /app/
#
## install WITH dev tooling
#RUN npm ci
#
## copy source code
#COPY ./src /app/src
#
## build frontend
#RUN npm run build
COPY ./*.json ./*.js /app/
# ./.babelrc

# install WITH dev tooling
RUN npm ci

# copy source code
COPY ./src /app/src

# build frontend
RUN npm run build


# Stage 3 - Build docker image suitable for production
Expand Down Expand Up @@ -80,7 +81,7 @@ COPY --from=backend-build /usr/local/bin/celery /usr/local/bin/celery
COPY --from=backend-build /app/src/ /app/src/

# copy frontend build statics
# COPY --from=frontend-build /app/src/open_producten/static /app/src/open_producten/static
COPY --from=frontend-build /app/src/open_producten/static /app/src/open_producten/static

# copy source code
COPY ./src /app/src
Expand Down
Loading
Loading