zenon/web-application-engineering
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
196 Commits 1 Branch 0 Tags
0a55437743f5ff8f2edeabda301c0a1f8cd02dee
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Marco Zeisler 0a55437743 Merge remote-tracking branch 'origin/master' 2021-05-11 20:21:27 +02:00
Marco Zeisler 47d9deb011 docker-build cannt execute docker-compose; 2021-05-11 20:20:31 +02:00
Marco Zeisler e80f2a9182 added one smoke test which always succeeds (for ci config). 2021-05-11 20:18:31 +02:00
Marco Zeisler 83300d91d0 only use chrome headless 2021-05-11 20:12:34 +02:00
Marco Zeisler 5b100f6e15 fix test runner 2021-05-11 20:11:07 +02:00
Marco Zeisler 3ec3516865 Merge remote-tracking branch 'origin/master' 2021-05-11 20:03:45 +02:00
Marco Zeisler 581e6d5a20 added missing karma-htmlfile-reporter 2021-05-11 20:03:24 +02:00
Marco Zeisler 5320763ca4 try another docker image 2021-05-11 19:59:32 +02:00
Marco Zeisler 9779d9f463 added ci info [skip ci] 2021-05-11 19:52:55 +02:00
Marco Zeisler 86db2e63f7 --password-stdin does not work 2021-05-11 19:49:50 +02:00
Marco Zeisler bb5f40c93a use npm update instead of npm install 2021-05-11 19:48:38 +02:00
Marco Zeisler 6d80cf94e3 retry 2021-05-11 19:46:14 +02:00
Marco Zeisler 7866f4152f use image containing docker binaries 2021-05-11 19:35:59 +02:00
Marco Zeisler a2bac88db1 use image containing docker binaries 2021-05-11 19:35:16 +02:00
Marco Zeisler d094ab5cd8 fix path 2021-05-11 19:32:31 +02:00
Marco Zeisler ea202da8a3 use docker tagged runner 2021-05-11 19:31:46 +02:00
Marco Zeisler 4039e1704b Merge remote-tracking branch 'origin/master' 2021-05-11 19:25:33 +02:00
Marco Zeisler ab2f137b32 swtich back to docker-compose but split up the different images; 2021-05-11 19:19:36 +02:00
Marco Zeisler 41aab51c7b swtich back to docker-compose 2021-05-11 19:17:36 +02:00
Marco Zeisler b278967417 swtich to docker build 2021-05-11 19:08:50 +02:00
Marco Zeisler 085e9e6e26 speedup process with an image which has angular cli installed 2021-05-11 18:42:33 +02:00
Marco Zeisler 1d1dd227fa build backend in CI 
use this build package in docker-compose;
 2021-05-11 18:41:14 +02:00
Marco Zeisler d04930fd8e update 2021-05-11 18:07:01 +02:00
Marco Zeisler 9a81845da8 fix linter errors; 2021-05-11 17:57:30 +02:00
Marco Zeisler fc38c747aa check if install also works and is faster than update 2021-05-11 17:54:39 +02:00
Marco Zeisler 8cd4f8281f added update 2021-05-11 17:50:57 +02:00
Marco Zeisler 66e2b7fe84 show if artifacts are there 2021-05-11 17:47:21 +02:00
Marco Zeisler 870912b530 use another image 2021-05-11 17:46:55 +02:00
Marco Zeisler 5df09e4e76 fix path; 2021-05-11 17:45:09 +02:00
Marco Zeisler 0d1d462b65 fix paths 2021-05-11 17:40:32 +02:00
Marco Zeisler bfb291836b build_be 
lint_fe
 2021-05-11 17:37:25 +02:00
Marco Zeisler 6f6132b7a6 fixed needs deps; 2021-05-11 17:19:52 +02:00
Marco Zeisler 578b60b49f added needs dependencies 2021-05-11 17:18:16 +02:00
Marco Zeisler b88542c970 added comments; 
change stage order;
 2021-05-11 17:15:57 +02:00
Marco Zeisler 6c9df4fb30 fix circular dependency 2021-05-11 17:12:18 +02:00
Marco Zeisler 601384d363 init 2021-05-11 17:03:39 +02:00
Marco Zeisler 91d6020e10 update to assignment 3 2021-05-11 16:58:07 +02:00
Marco Zeisler 499072f9dc updated hash due to new image; 2021-05-04 22:58:38 +02:00
Marco Zeisler 2edb3da55f added default icon 2021-05-04 22:52:44 +02:00
Marco Zeisler 77cecb1e7c updated 2021-05-04 22:42:14 +02:00
Marco Zeisler 8876013c7a return only 200er ok 2021-05-04 22:27:25 +02:00
Marco Zeisler 45ea7716d0 remove twitter auth, does not work 2021-05-04 22:26:04 +02:00
Marco Zeisler 53c134021e use angular cli server; 2021-05-04 22:22:08 +02:00
Marco Zeisler db52ac7b75 update 2021-05-04 22:09:12 +02:00
Marco Zeisler ffb0a74e89 Merge remote-tracking branch 'origin/master' 2021-05-04 21:49:32 +02:00
Marco Zeisler c7bbafd94e remove default.conf 2021-05-04 21:49:24 +02:00
Marco Zeisler c629988bbf copy properly 2021-05-04 21:40:02 +02:00
Marco Zeisler 6a913f35c6 copy nginx conf 
added default.conf
 2021-05-04 21:32:30 +02:00
Marco Zeisler 79a9e0edd5 bump to bsp-2 2021-05-04 20:57:22 +02:00
Marco Zeisler 438168fbc2 fix post_logout_redirect_uri 2021-05-04 20:56:56 +02:00
Marco Zeisler 7a1877072b remove whitespaces 2021-05-04 20:47:40 +02:00
Marco Zeisler 9d1d3f8be6 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	backend/app_be/views/twitter_api.py
 2021-05-04 20:41:34 +02:00
Marco Zeisler 582bbb4c93 use manage.py server 2021-05-04 20:41:20 +02:00
Marco Zeisler 8f1272afcf remove gunicorn 2021-05-04 20:41:12 +02:00
Marco Zeisler ed9356b7f9 use logging instead of prints; 2021-05-04 20:41:03 +02:00
Marco Zeisler 930e23a01e rename 2021-05-04 20:28:04 +02:00
Marco Zeisler 77587b5194 fix openid connection redirect 2021-05-04 20:18:33 +02:00
Marco Zeisler edac97ec8e fix redirect_uri 2021-05-04 20:15:33 +02:00
Marco Zeisler f724154248 re-added openid endpoint 2021-05-04 19:54:38 +02:00
Marco Zeisler ccd241b5df update; 2021-05-04 19:47:59 +02:00
Marco Zeisler 6abe9ebc35 added vars; 
fix docker-compose.yml;
 2021-05-04 19:37:58 +02:00
Marco Zeisler 560c688817 fix wsgi.py; 
added entrypoint.sh as django entrypoint;
install and use gunicorn as prod server;
 2021-05-04 19:37:38 +02:00
Marco Zeisler 065922b279 delete environment.prod.ts; 
use environment.ts for location + port;
 2021-05-04 19:36:25 +02:00
Marco Zeisler 42edbdd195 also make migrations and migrate on startup; 2021-05-04 18:51:18 +02:00
Marco Zeisler cdfc6c6ee2 added --no-reload 2021-05-04 18:43:14 +02:00
Marco Zeisler be0a9e32ba added .empty to keep folder 2021-05-04 18:43:00 +02:00
Marco Zeisler 0ea126ac54 update 2021-05-04 18:42:32 +02:00
Marco Zeisler 8e865f72fa ignore logfile; 2021-05-03 18:44:56 +02:00
Marco Zeisler cb0a803cd8 Merge remote-tracking branch 'origin/master' 2021-05-03 18:44:44 +02:00
Marco Zeisler f50cc0eef9 name db folder container_db to distinguish between local app db; 2021-05-03 18:44:36 +02:00
Marco Zeisler dd4eff842c Merge remote-tracking branch 'origin/master' 2021-05-03 18:38:55 +02:00
Marco Zeisler 163253866d activated interceptor.service.ts; 
automatically checks if isAuthenticated():
 - if !isAuthenticated() (token expired), route to login and delete token from sessionStorage;
 2021-05-03 18:38:46 +02:00
Marco Zeisler 4fe04eaa49 Merge remote-tracking branch 'origin/master' 2021-05-03 18:03:45 +02:00
Marco Zeisler 5bc989ef8c update 2021-05-03 18:03:36 +02:00
Marco Zeisler 22a3493905 Merge remote-tracking branch 'origin/master' 2021-05-03 17:37:53 +02:00
Marco Zeisler 06deb26eb0 improve dockerfile; 2021-05-03 16:45:48 +02:00
Marco Zeisler 8c34ece094 use .env vars in waecm_g4_be; 
mounted ./db to /code/app_be/db to persist db;
 2021-05-03 15:56:05 +02:00
Marco Zeisler fdf64ca70a update 2021-05-03 15:55:14 +02:00
Marco Zeisler f766633c84 ignore docker-compose db folder; 2021-05-03 15:55:02 +02:00
Marco Zeisler 73f3a08c30 fix AppBeConfig; 2021-05-02 21:27:49 +02:00
Marco Zeisler 3e3bf1263a reformat code; 2021-04-30 16:18:20 +02:00
Marco Zeisler a4e6a64444 reformat code; 2021-04-30 16:17:24 +02:00
Marco Zeisler ed1d23c7cf move db to app_be/db folder for later on mounting; 2021-04-30 16:13:53 +02:00
Marco Zeisler 3cae7b432d Merge remote-tracking branch 'origin/master' 2021-04-30 16:07:30 +02:00
Marco Zeisler 907788ffa7 added simple model setup for django tweetbot; 2021-04-30 16:07:19 +02:00
Marco Zeisler f57a0cb5ea remove channels (websocket) config; 2021-04-30 16:07:19 +02:00
Marco Zeisler 838845e65f remove cache.sqlite; 
remove app_be/services;
remove app_be/views/tests;
remove app_be/views/ws_api.py;
remove app_be/routing.py;
remove app_be/tests.py;
 2021-04-30 16:07:19 +02:00
Marco Zeisler 212062ecdf name='homeschooling-be-app' -> name='waecm-2021-group-04'; 
remove channels (websockets) dep;
remove channels_redis dep;
 2021-04-30 16:07:18 +02:00
Marco Zeisler 32f032df83 update; 2021-04-30 16:04:04 +02:00
Marco Zeisler 43c40d15cb update; 2021-04-30 16:03:55 +02:00
Marco Zeisler aa16fd7180 Merge remote-tracking branch 'origin/master' 2021-04-30 15:35:39 +02:00
Marco Zeisler 3ba650ae22 update; 2021-04-30 15:34:22 +02:00
Marco Zeisler 8d97ecec6c Merge remote-tracking branch 'origin/master' 2021-03-24 19:02:28 +01:00
Marco Zeisler 5efb739e25 added hostname for waecm_g4_fe; 2021-03-24 19:02:05 +01:00
Marco Zeisler 4c0e7406f5 remove eslint file; 2021-03-24 18:10:18 +01:00
Marco Zeisler def91edd93 uninstall eslint; 2021-03-24 18:09:02 +01:00
Marco Zeisler 1aaf59973a fix linter 2021-03-24 18:07:41 +01:00
Marco Zeisler aa42b8544f Merge remote-tracking branch 'origin/master' 2021-03-24 17:55:36 +01:00
Marco Zeisler 0e361bca64 eslint and fix code; 2021-03-24 17:55:25 +01:00
Marco Zeisler 38086513df call backend after successful login; 2021-03-21 20:40:00 +01:00