Skip to content
This repository was archived by the owner on Sep 4, 2024. It is now read-only.
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
3 changes: 3 additions & 0 deletions backend/core/fileupload/viewsets.py
Original file line number Diff line number Diff line change
Expand Up @@ -386,6 +386,9 @@ def list(self, request, **kwargs):
familyId = self.request.query_params.get("family")
if familyId is not None:
queryset = queryset.filter(family__id=familyId).order_by("version")
owner = self.request.query_params.get("owner")
if owner is not None:
queryset = queryset.filter(owner=owner)
files = FilesSerializer(queryset, many=True).data
anonymized_files = []
for file in files:
Expand Down
3 changes: 3 additions & 0 deletions backend/core/routers.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,9 @@
# FEATURE MODEL RELATED
# details file upload https://djangotricks.blogspot.com/2020/03/how-to-upload-a-file-using-django-rest-framework.html
router.register(r"files", FileUploadViewSet, basename="file-upload")
""" router.register(
r"files/uploaded/confirmed", ConfirmedFileViewSet, basename="confirmed-files"
) """
router.register(
r"files/uploaded/confirmed", ConfirmedFileViewSet, basename="confirmed-files"
)
Expand Down
1 change: 0 additions & 1 deletion backend/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ djangorestframework-simplejwt==5.0.0
docker==6.0.0
Faker==14.2.0
idna==3.3
psycopg2-binary==2.9.2
pycparser==2.21
PyGithub==1.55
PyJWT==2.3.0
Expand Down
302 changes: 288 additions & 14 deletions frontend/package-lock.json

Large diffs are not rendered by default.

2,735 changes: 2,693 additions & 42 deletions frontend/src/views/FileDetail.vue

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions frontendVue3/.browserslistrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
> 1%
last 2 versions
not dead
not ie 11
5 changes: 5 additions & 0 deletions frontendVue3/.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
4 changes: 4 additions & 0 deletions frontendVue3/.env.development
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
VITE_APP_DOMAIN="http://localhost:8000/"
VITE_APP_DOMAIN_FRONTEND="http://localhost:3000/"
VITE_APP_DOMAIN_WEBSOCKET="localhost"
VITE_APP_DOMAIN_WEBSOCKET_PORT=9000
5 changes: 5 additions & 0 deletions frontendVue3/.env.production
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
VITE_APP_DOMAIN="https://doener.tobiasbetz.de/"
VITE_APP_DOMAIN_FRONTEND="https://ddueruem.tobiasbetz.de/"
VITE_APP_DOMAIN_WEBSOCKET="boerek.tobiasbetz.de"
VITE_APP_DOMAIN_WEBSOCKET_PORT=443
NODE_ENV="production"
4 changes: 4 additions & 0 deletions frontendVue3/.env.testing
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
VITE_APP_DOMAIN="http://localhost:8000/"
VITE_APP_DOMAIN_FRONTEND="http://localhost:3000/"
VITE_APP_DOMAIN_WEBSOCKET="localhost"
VITE_APP_DOMAIN_WEBSOCKET_PORT=9000
10 changes: 10 additions & 0 deletions frontendVue3/.eslintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
module.exports = {
root: true,
env: {
node: true,
},
extends: [
'plugin:vue/vue3-essential',
'eslint:recommended',
],
}
22 changes: 22 additions & 0 deletions frontendVue3/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
.DS_Store
node_modules
/dist

# local env files
.env.local
.env.*.local

# Log files
npm-debug.log*
yarn-debug.log*
yarn-error.log*
pnpm-debug.log*

# Editor directories and files
.idea
.vscode
*.suo
*.ntvs*
*.njsproj
*.sln
*.sw?
8 changes: 8 additions & 0 deletions frontendVue3/.prettierrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"tabWidth": 4,
"useTabs": false,
"semi": true,
"singleQuote": true,
"bracketSpacing": true,
"jsxBracketSameLine": false
}
57 changes: 57 additions & 0 deletions frontendVue3/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
# essentials

## Project setup

```
# yarn
yarn

# npm
npm install

# pnpm
pnpm install
```

### Compiles and hot-reloads for development

```
# yarn
yarn dev

# npm
npm run dev

# pnpm
pnpm dev
```

### Compiles and minifies for production

```
# yarn
yarn build

# npm
npm run build

# pnpm
pnpm build
```

### Lints and fixes files

```
# yarn
yarn lint

# npm
npm run lint

# pnpm
pnpm lint
```

### Customize configuration

See [Configuration Reference](https://vitejs.dev/config/).
23 changes: 23 additions & 0 deletions frontendVue3/index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<!DOCTYPE html>
<html lang="en">

<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width,initial-scale=1.0">
<meta name="description" content="A web service for sharing feature model instances and collaborative
benchmarking">
<meta name="og:description" content="A web service for sharing feature model instances and collaborative
benchmarking">
<meta name="keywords" content="feature, model, analyse, collaborative, diagram, bdd">
<meta name="author" content="Tobias Heß">
<title>variability.dev</title>
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:100,300,400,500,700,900">
</head>

<body>
<div id="app"></div>
<script type="module" src="/src/main.js"></script>
</body>

</html>
19 changes: 19 additions & 0 deletions frontendVue3/jsconfig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"compilerOptions": {
"target": "es5",
"module": "esnext",
"baseUrl": "./",
"moduleResolution": "node",
"paths": {
"@/*": [
"src/*"
]
},
"lib": [
"esnext",
"dom",
"dom.iterable",
"scripthost"
]
}
}
Loading