Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
30649e4
Add first implementation of webpack integration
kozzztik Oct 22, 2020
6171e97
Reorganize JS modules to use webpack
kozzztik Oct 22, 2020
0e18b2f
Add webpack dev server
kozzztik Oct 22, 2020
a45369e
Move rest Vue related JS files to webpack, except CKEditor(it not sup…
kozzztik Oct 22, 2020
d589ee9
Merge pull request #267 from kozzztik/master
kozzztik Oct 28, 2020
c71dbc4
Merge branch 'dev' of https://github.com/kozzztik/tulius into webpack
kozzztik Oct 28, 2020
0cf3bcd
Switch webpack to vue-cli
kozzztik Oct 28, 2020
5b6d00d
Refactor vue app recreating process
kozzztik Oct 29, 2020
1f37883
Fix failing test
kozzztik Oct 29, 2020
184a1ae
Merge pull request #268 from kozzztik/webpack
kozzztik Oct 29, 2020
e24076c
Fix production websocket url
kozzztik Oct 29, 2020
59b07ae
Merge pull request #270 from kozzztik/webpack
kozzztik Oct 29, 2020
a85abb5
First use of Vue templates
kozzztik Oct 29, 2020
3126a46
Merge branch 'dev' of https://github.com/kozzztik/tulius into webpack
kozzztik Oct 29, 2020
6745222
Merge pull request #271 from kozzztik/webpack
kozzztik Oct 29, 2020
86285db
First implementation of native django websockets
kozzztik Oct 30, 2020
9ad0fa8
Switch from uwsgi to asgi and remove proxy nginx container and websoc…
kozzztik Oct 30, 2020
ae6fbd8
Merge branch 'dev' of https://github.com/kozzztik/tulius into asgi
kozzztik Oct 30, 2020
66e8cdb
Get back support of old websockets protocol.
kozzztik Oct 30, 2020
33d70df
Merge pull request #272 from kozzztik/asgi
kozzztik Oct 30, 2020
5d73848
Fix some new websockets deploy issues.
kozzztik Oct 30, 2020
4eaa66c
add nginx redirects
kozzztik Oct 30, 2020
c45fff6
Merge pull request #273 from kozzztik/asgi
kozzztik Oct 30, 2020
416c7e3
nginx proto fix
kozzztik Oct 30, 2020
f631835
Remove wsgi app file
kozzztik Oct 30, 2020
ea79646
Merge pull request #274 from kozzztik/asgi
kozzztik Oct 30, 2020
1731b4f
Integrate websockets inside of Django internals. (#275)
kozzztik Nov 2, 2020
696456b
Merge branch 'dev' of https://github.com/kozzztik/tulius into fix_rea…
kozzztik Nov 2, 2020
2fa3eec
Merge pull request #278 from kozzztik/fix_read_marks
kozzztik Nov 2, 2020
7b009bf
Refactor frontend thread "mark as not read" feature.
kozzztik Nov 19, 2020
b979a04
Refactor thread page to use Vue inheritance
kozzztik Nov 19, 2020
04193d3
Refactor reply form
kozzztik Nov 19, 2020
cbc71fe
Merge branch 'dev' of https://github.com/kozzztik/tulius into refacto…
kozzztik Aug 13, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -95,3 +95,6 @@ settings_production.py
/sql-logfile.txt
/logfile.txt
/data/
/tulius/static/node_modules/
/tulius/static/app/index_bundle.js
/tulius/static/package-lock.json
5 changes: 4 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@ FROM kozzztik/tulius:base_3.1.0
RUN mkdir /opt/tulius/data
RUN pip install --upgrade pip
# for coveralls
RUN apt-get install git -y
RUN curl -sL https://deb.nodesource.com/setup_12.x | bash -
RUN apt-get update && apt-get install nodejs git -y
RUN npm install @vue/cli -g
ENV TULIUS_BRANCH local

ADD tulius /opt/tulius/tulius
Expand All @@ -24,6 +26,7 @@ RUN pip install -r requirements.txt
ADD .git /opt/tulius/.git

RUN python manage.py compilemessages
RUN cd tulius/static && npm install && npm run build

ADD gunicorn.conf.py /opt/tulius/gunicorn.conf.py
CMD [ "gunicorn" ]
14 changes: 12 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -121,9 +121,18 @@ Update repo if needed (use separate branch and PR)
16. Check that everything works. Profit.

# Running on local environment
To run frontend part you need to install node.js & npm:
- for Windows use installer https://nodejs.org/en/download/
- for Linux (Debian based) ```apt-get install nodejs```

To use Tulius on local dev environment you need to at least 1 instance]
(2 for correct work of heavy requests).
Then switch to tulius/static folder and run
```
npm install @vue/cli -g
npm install -D
```

To use Tulius on local dev environment you need to at least 2 instances
3 for correct work of heavy requests).
For all of them it is needed to set environment variable:

```bash
Expand All @@ -136,6 +145,7 @@ file from template and set needed options there.
Instances, that needed to run:
1. `manage.py runserver` - Django instance for backend HTTP requests
2. `celery -A tulius worker -l info` - for deferred tasks (optional)
3. `npm run serve` in tulius/static directory for frontend webpack dev server

On Windows, as Celery not supports it yet, install gevent:

Expand Down
4 changes: 3 additions & 1 deletion scripts/BaseDockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
FROM python:3.11
EXPOSE 7000
RUN apt-get update && apt-get install gettext -y
RUN curl -sL https://deb.nodesource.com/setup_12.x | bash -
RUN apt-get update && apt-get install gettext git nodejs -y
RUN npm install @vue/cli -g
ENV PYTHONUNBUFFERED 1
ENV TULIUS_BRANCH local
RUN mkdir /opt/tulius
Expand Down
106 changes: 0 additions & 106 deletions scripts/tulius/nginx/tulius.conf

This file was deleted.

12 changes: 12 additions & 0 deletions settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,18 @@
},
]

if env == 'dev':
VUE_BUNDLE = [
'http://localhost:9000/static/js/chunk-vendors.js',
'http://localhost:9000/static/js/app.js'
]
else:
VUE_BUNDLE = [
'/static/dist/js/chunk-vendors.js',
'/static/dist/js/app.js'
]


AUTHENTICATION_BACKENDS = (
'tulius.vk.backend.VKBackend',
'django.contrib.auth.backends.ModelBackend',
Expand Down
62 changes: 0 additions & 62 deletions tulius/forum/static/forum/components/reply_form.html

This file was deleted.

6 changes: 0 additions & 6 deletions tulius/forum/static/forum/pages/thread.html

This file was deleted.

7 changes: 0 additions & 7 deletions tulius/forum/static/forum/snippets/latest_post.html

This file was deleted.

10 changes: 0 additions & 10 deletions tulius/forum/static/forum/snippets/latest_post.js

This file was deleted.

41 changes: 0 additions & 41 deletions tulius/gameforum/static/gameforum/pages/thread.html

This file was deleted.

56 changes: 0 additions & 56 deletions tulius/gameforum/static/gameforum/pages/thread.js

This file was deleted.

Loading