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

Deployserver #23

Open
wants to merge 104 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
104 commits
Select commit Hold shift + click to select a range
1e109c5
add Navdrawer.vue
Apr 5, 2020
bab83d7
rename Navdrawer.vue to NavDrawer.vue
Apr 5, 2020
8064863
fix endpoint link
Apr 5, 2020
077da5a
add Navdrawer.vue
Apr 5, 2020
9e0090a
Merge pull request #1 from bmake/feature/NavDrawer
Airop Apr 9, 2020
5dc4682
add Makefile with options start, stop, upload, clean-database
Apr 13, 2020
ef1fef2
Merge pull request #2 from bmake/feature/Makefile
ArkanEmre Apr 13, 2020
3dc060d
-add browser-language-detection for default language
Apr 16, 2020
2af6c02
add fixed card size
Apr 18, 2020
92259a5
Merge remote-tracking branch 'origin/develop' into feature/i18n
Apr 19, 2020
1fd00dc
add flip effect to card
Apr 19, 2020
92e3724
-progress bar
Apr 20, 2020
146e73d
-added a progress bar to give visual feedback to the user while data …
Apr 20, 2020
b066666
Merge branch 'feature/lectureCards' of https://github.com/bmake/lectu…
May 2, 2020
f52a670
-added overlay with full description, when clicking on the cards
May 2, 2020
5f1dd52
Merge branch 'develop' into feature/Loading
May 4, 2020
ce9a851
Merge branch 'develop' into feature/i18n
ArkanEmre May 5, 2020
c0c1655
add height property to ProgressBar
ArkanEmre May 5, 2020
5a177d5
Merge branch 'feature/i18n' of https://github.com/bmake/lectures_at_t…
May 7, 2020
63fe197
-added flag button, that shows the flag of the current page language
May 7, 2020
2067698
-moved vue.use(flagIcon) to main.js
May 7, 2020
b978dbf
move hyphens css class
ArkanEmre May 10, 2020
6cd87da
-removed circular loading circle
May 10, 2020
29968f7
fix conditional-rendering
ArkanEmre May 14, 2020
18956ec
reformat code
ArkanEmre May 14, 2020
049b49d
fix conditional-rendering
ArkanEmre May 14, 2020
d448374
Merge pull request #3 from bmake/feature/i18n
ArkanEmre May 14, 2020
267ff1d
Merge branch 'feature/i18n' of github.com:bmake/lectures_at_thb into …
ArkanEmre May 14, 2020
6eedbdb
Merge pull request #6 from bmake/feature/i18n
ArkanEmre May 14, 2020
2805fca
-changed hover card background color + text color
May 14, 2020
7ccebc0
Merge branch 'feature/HoverCards' of https://github.com/bmake/lecture…
May 14, 2020
4cd81fb
-disabled hover effect on lecture cards
May 14, 2020
5e15c2d
-added overlay-effect @hover for lecture cards
May 18, 2020
6f8c9ee
Merge branch 'develop' into feature/HoverCards
ArkanEmre May 21, 2020
ab2ff44
-changed width of hovercard
May 21, 2020
8d444a0
Merge branch 'feature/HoverCards' of https://github.com/bmake/lecture…
May 21, 2020
24c2ce0
-added hover effect on lecture cards
May 22, 2020
38844a5
add carousel
ArkanEmre May 22, 2020
a71be71
add close and watch buttons to overlay
ArkanEmre May 22, 2020
cac7fee
change icons
ArkanEmre May 22, 2020
f106b12
Merge pull request #7 from bmake/feature/HoverCards
ArkanEmre May 22, 2020
48d5e55
Merge branch 'develop' into feature/Loading
ArkanEmre May 22, 2020
ed14580
Merge pull request #8 from bmake/feature/Loading
ArkanEmre May 22, 2020
c0fa7f8
Merge branch 'develop' into feature/videoLectureFilter
ArkanEmre May 22, 2020
04daa0e
Merge branch 'develop' into feature/videoLectureFilter
ArkanEmre May 22, 2020
51d3360
fix issue with toolbar height
ArkanEmre Jun 11, 2020
09f4318
Create electures_at_thb_2020_06_26.ttl
UniVera Jul 2, 2020
bc51b35
edit docker-compose.yml to use the API container
ArkanEmre Oct 3, 2020
d65b921
remove console
ArkanEmre Oct 3, 2020
7d22f27
Merge pull request #13 from bmake/feature/integrateAPI
ArkanEmre Oct 3, 2020
a7718b4
Merge branch 'develop' into feature/videoLectureFilter
ArkanEmre Oct 3, 2020
4de2daa
update namespace links
ArkanEmre Oct 23, 2020
2eb6ed8
Rename electures_at_thb_2020_06_26.ttl to electures_at_thb.ttl
ArkanEmre Oct 23, 2020
8336db7
Delete lectures_at_thb_2019_12_03.ttl
ArkanEmre Oct 23, 2020
a85ba8e
update LATEST_RDF_FILE
ArkanEmre Oct 23, 2020
91fd1e4
Merge pull request #14 from bmake/CurateDataBase
ArkanEmre Oct 23, 2020
7d5addf
fix ProgressBar
ArkanEmre Oct 23, 2020
adb1d43
Merge branch 'develop' into feature/videoLectureFilter
ArkanEmre Oct 23, 2020
699cdc7
adjust department block
huwenxin Oct 30, 2020
dcc0682
Merge pull request #15 from bmake/feature/videoLectureFilter
ArkanEmre Nov 6, 2020
3311f7f
edit LectureCard layout (lecturer(s), duration)
ArkanEmre Nov 13, 2020
2cb9d66
fix typo
ArkanEmre Nov 13, 2020
1396c73
Merge pull request #16 from bmake/feature/lectureCard
ArkanEmre Nov 13, 2020
8bd2ba6
fix BPMgt1 headline in English
ArkanEmre Nov 13, 2020
ffe2d8d
detailed video page routing
huwenxin Nov 13, 2020
c0caabd
Merge remote-tracking branch 'origin/develop' into feature/routingVid…
huwenxin Nov 13, 2020
4de067f
refactor methods
ArkanEmre Nov 13, 2020
32e9e6a
Merge pull request #17 from bmake/feature/routingVideoObjects
ArkanEmre Nov 13, 2020
a1b0c24
video page design with embedded video
huwenxin Nov 24, 2020
ded29d2
Merge branch 'feature/routingVideoObjects' of https://github.com/bmak…
huwenxin Nov 24, 2020
afc8225
routing to video on the same page, error fix on detailed video page
huwenxin Dec 1, 2020
5b4932f
add videoURLs to Player
ArkanEmre Dec 4, 2020
58ab3be
add build and pull to makefile
ArkanEmre Dec 10, 2020
5a9b9e3
Merge pull request #19 from bmake/feature/Makefile
ArkanEmre Dec 10, 2020
e6674a1
bug fix on loading videos
huwenxin Dec 10, 2020
0b962a3
adjust height of video player and playlist
huwenxin Mar 12, 2021
c050d81
Merge branch 'feature/routingVideoObjects' into develop
huwenxin Mar 12, 2021
8b801ec
Merge branch 'feature/videoComponent' into develop
huwenxin Mar 12, 2021
add3850
load video player bug fix
huwenxin Mar 12, 2021
cf5d327
title change to corresponding language tag
huwenxin Mar 12, 2021
a0263b4
Merge branch 'feature/videoComponent' into develop
huwenxin Mar 12, 2021
61b1916
Merge branch 'develop' into deployserver
huwenxin Apr 8, 2021
96deb1d
adjust localhost to IP address
Apr 15, 2021
e012197
video auto start
huwenxin Jun 21, 2021
98f0a91
Merge branch 'deployserver' of https://github.com/bmake/lectures_at_t…
huwenxin Jun 21, 2021
00436cb
adjust server host name
huwenxin Jun 21, 2021
4adc41e
autoplay next video
huwenxin Jun 22, 2021
984fe37
adjust localhost to IP of server
huwenxin Jun 23, 2021
2f8218e
rename clips to chapter
huwenxin Jun 23, 2021
9a45942
Merge branch 'develop' into deployserver
huwenxin Jun 23, 2021
59a629f
activate FBI
huwenxin Aug 12, 2021
b28b3bd
Merge branch 'develop' into deployserver
huwenxin Aug 12, 2021
b423ff9
Update SearchableList.vue
huwenxin Aug 12, 2021
3edf9cf
turtle data update
huwenxin Aug 20, 2021
ef1c600
Update docker-compose.yml
huwenxin Aug 20, 2021
9e5a0e0
add static sites
huwenxin Aug 31, 2021
9542306
Merge branch 'develop' of https://github.com/bmake/lectures_at_thb in…
huwenxin Aug 31, 2021
def67ab
Merge branch 'develop' into deployserver
huwenxin Aug 31, 2021
6eb14c2
Merge branch 'deployserver' of https://github.com/bmake/lectures_at_t…
huwenxin Aug 31, 2021
1804546
fix some english expressions
huwenxin Oct 6, 2021
cc1a24a
Merge branch 'develop' into deployserver
huwenxin Oct 6, 2021
2eaa5ef
show host name
huwenxin Oct 8, 2021
71667ab
change homepage pic
huwenxin Oct 18, 2021
e7c5f3f
Merge branch 'develop' into deployserver
huwenxin Oct 18, 2021
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
16 changes: 16 additions & 0 deletions +
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
ajust height of video player and playlist
# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
#
# On branch feature/videoComponent
# Your branch is up to date with 'origin/feature/videoComponent'.
#
# Changes to be committed:
# modified: src/components/LectureCard.vue
# modified: src/components/SearchableList.vue
# modified: src/components/Toolbar.vue
# modified: src/components/VideoLectureFilters.vue
# modified: src/locales/de.json
# modified: src/locales/en.json
# modified: src/views/Video.vue
#
2 changes: 2 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
**/node_modules
**/dist
5 changes: 5 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
[*.{js,jsx,ts,tsx,vue}]
indent_style = space
indent_size = 2
trim_trailing_whitespace = true
insert_final_newline = true
1 change: 1 addition & 0 deletions .env
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
VUE_APP_I18N_FALLBACK_LOCALE=de
10 changes: 3 additions & 7 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,6 @@ yarn-error.log*
*.sln
*.sw?

# docker files
docker-compose.yml
docker-compose_production.yml
.dockerignore
Dockerfile
Dockerfile_production
nginx.conf
# service directories files
nginx.conf
fuseki/*
15 changes: 15 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# BASE image
FROM node:alpine AS BASE

# set working directory
WORKDIR /app
ENV PATH /app/node_modules/.bin:$PATH
COPY package.json /app/package.json
# add `/app/node_modules/.bin` to $PATH

FROM BASE AS RELEASE
# install and cache app dependencies
RUN npm install --silent

# start app
CMD ["npm", "run", "serve"]
11 changes: 11 additions & 0 deletions Dockerfile_production
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
FROM node:latest as BUILD_STAGE
WORKDIR /app
COPY package*.json ./
RUN npm install
COPY ./ .
RUN npm run build

FROM nginx as PRODUCTION_STAGE
RUN mkdir /app
COPY --from=BUILD_STAGE /app/dist /app
COPY nginx.conf /etc/nginx/nginx.conf
38 changes: 38 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
#########################
# ENVIRONMENT VARIABLES #
#########################
DATA_DIRECTORY=data
FUSEKI_DIRECTORY=fuseki
LATEST_RDF_FILE=electures_at_thb.ttl

#########################
# TARGETS #
#########################
start:
if [ ! -d "${FUSEKI_DIRECTORY}/configuration" ]; \
then mkdir -p ${FUSEKI_DIRECTORY}/configuration/; \
fi && \
cp ${DATA_DIRECTORY}/fuseki/configuration/* ${FUSEKI_DIRECTORY}/configuration/ && \
rm -f ${FUSEKI_DIRECTORY}/databases/lectures_at_thb/tdb.lock && \
docker-compose up -d

stop:
docker-compose down && \
rm -f ${FUSEKI_DIRECTORY}/databases/lectures_at_thb/tdb.lock

build:
docker-compose build

pull:
docker-compose pull
upload:
until [ "`docker inspect -f {{.State.Health.Status}} fuseki`"=="healthy" ]; \
do \
sleep 0.1; \
done && \
curl --request POST --url http://localhost:3030/lectures_at_thb/upload \
--header 'content-type: multipart/form-data' \
-F 'file=@${DATA_DIRECTORY}/rdf/${LATEST_RDF_FILE}'

clean-database:
rm -f -R ${FUSEKI_DIRECTORY}
61 changes: 45 additions & 16 deletions config.js
Original file line number Diff line number Diff line change
@@ -1,18 +1,47 @@
export default Object.freeze({
query:
'PREFIX vidp: <https://bmake.th-brandenburg.de/vidp#>\n' +
'PREFIX schema: <https://schema.org/>\n' +
'PREFIX vide: <https://bmake.th-brandenburg.de/vide#>\n' +
'PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>\n' +
'\n' +
'SELECT ?url ?label ?thumbnailName ?description\n' +
'WHERE {\n' +
'\t?videoLecture\ta\tvidp:VideoLecture ;\n' +
' schema:url ?url;\n' +
' rdfs:label ?label ;\n' +
' schema:thumbnail ?thumbnail;\n' +
' schema:description ?description .\n' +
' \t?thumbnail schema:name ?thumbnailName .\n' +
' \tFILTER ( lang(?description) = "en" )\n' +
'}'
query: `PREFIX vidp: <https://bmake.th-brandenburg.de/vidp#>
PREFIX schema: <https://schema.org/>
PREFIX vide: <https://bmake.th-brandenburg.de/vide#>
PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>

SELECT ?videoLecture ?url ?label ?thumbnailName ?description
WHERE {
?videoLecture a vidp:VideoLecture ;
schema:url ?url;
rdfs:label ?label ;
schema:thumbnail ?thumbnail;
schema:description ?description .
?thumbnail schema:name ?thumbnailName .
FILTER ( lang(?description) = "en" )
}
`,
clipCount: `PREFIX vidp: <https://bmake.th-brandenburg.de/vidp#>
PREFIX schema: <https://schema.org/>
PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>

SELECT (COUNT(?clip) AS ?clipCount)
WHERE {
?clip a vidp:DoubleClip ;
schema:isPartOf <%videoLecture%> ;
schema:duration ?clipDuration .
}
`,
studyPrograms: `PREFIX vidp: <https://bmake.th-brandenburg.de/vidp#>
PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>

SELECT DISTINCT ?studyProgram
WHERE {
?studyProgramUri a vidp:StudyProgram ;
rdfs:label ?studyProgram .
}
`,
modules: `PREFIX vidp: <https://bmake.th-brandenburg.de/vidp#>
PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>

SELECT DISTINCT ?module
WHERE {
?moduleUri a vidp:Module ;
rdfs:label ?module .
}
`
});
50 changes: 50 additions & 0 deletions data/fuseki/configuration/lectures_at_thb.ttl
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
@prefix : <http://base/#> .
@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
@prefix tdb2: <http://jena.apache.org/2016/tdb#> .
@prefix ja: <http://jena.hpl.hp.com/2005/11/Assembler#> .
@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
@prefix fuseki: <http://jena.apache.org/fuseki#> .

tdb2:DatasetTDB rdfs:subClassOf ja:RDFDataset .

ja:DatasetTxnMem rdfs:subClassOf ja:RDFDataset .

<http://jena.hpl.hp.com/2008/tdb#DatasetTDB>
rdfs:subClassOf ja:RDFDataset .

<http://jena.hpl.hp.com/2008/tdb#GraphTDB>
rdfs:subClassOf ja:Model .

tdb2:GraphTDB2 rdfs:subClassOf ja:Model .

ja:MemoryDataset rdfs:subClassOf ja:RDFDataset .

ja:RDFDatasetZero rdfs:subClassOf ja:RDFDataset .

<http://jena.apache.org/text#TextDataset>
rdfs:subClassOf ja:RDFDataset .

:service_tdb_all a fuseki:Service ;
rdfs:label "TDB2 lectures_at_thb" ;
fuseki:dataset :tdb_dataset_readwrite ;
fuseki:name "lectures_at_thb" ;
fuseki:serviceQuery "query" , "" , "sparql" ;
fuseki:serviceReadGraphStore "get" ;
fuseki:serviceReadQuads "" ;
fuseki:serviceReadWriteGraphStore
"data" ;
fuseki:serviceReadWriteQuads "" ;
fuseki:serviceUpdate "" , "update" ;
fuseki:serviceUpload "upload" .

:tdb_dataset_readwrite
a tdb2:DatasetTDB2 ;
tdb2:location "/fuseki/databases/lectures_at_thb" .

tdb2:GraphTDB rdfs:subClassOf ja:Model .

ja:RDFDatasetOne rdfs:subClassOf ja:RDFDataset .

ja:RDFDatasetSink rdfs:subClassOf ja:RDFDataset .

tdb2:DatasetTDB2 rdfs:subClassOf ja:RDFDataset .
Loading