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

chore: clean asset directory #37

Merged
merged 7 commits into from
Jul 28, 2021
Merged
Show file tree
Hide file tree
Changes from 4 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: 2 additions & 1 deletion front/assets/.gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
node_modules/
node_modules/
dist
2 changes: 0 additions & 2 deletions front/assets/dist/browse.7bc46988589a88ff0c74.js

This file was deleted.

30 changes: 0 additions & 30 deletions front/assets/dist/browse.7bc46988589a88ff0c74.js.LICENSE.txt

This file was deleted.

2 changes: 0 additions & 2 deletions front/assets/dist/course.55efbfeca76be463cf09.js

This file was deleted.

30 changes: 0 additions & 30 deletions front/assets/dist/course.55efbfeca76be463cf09.js.LICENSE.txt

This file was deleted.

2 changes: 0 additions & 2 deletions front/assets/dist/generic.e5634621ea08176bd60f.js

This file was deleted.

5 changes: 0 additions & 5 deletions front/assets/dist/generic.e5634621ea08176bd60f.js.LICENSE.txt

This file was deleted.

2 changes: 0 additions & 2 deletions front/assets/dist/index.dd1efdd4cbe9d0bccc9d.js

This file was deleted.

30 changes: 0 additions & 30 deletions front/assets/dist/index.dd1efdd4cbe9d0bccc9d.js.LICENSE.txt

This file was deleted.

6 changes: 0 additions & 6 deletions front/assets/dist/main.css

This file was deleted.

13 changes: 0 additions & 13 deletions front/assets/dist/manifest.json

This file was deleted.

2 changes: 0 additions & 2 deletions front/assets/dist/planner.378be7e3a73f42abcd54.js

This file was deleted.

39 changes: 0 additions & 39 deletions front/assets/dist/planner.378be7e3a73f42abcd54.js.LICENSE.txt

This file was deleted.

1 change: 0 additions & 1 deletion front/assets/dist/runtime.1df251ca9f9e334b74ab.js

This file was deleted.

2 changes: 0 additions & 2 deletions front/assets/dist/shared.4bc4549582216e4dc2ea.js

This file was deleted.

30 changes: 0 additions & 30 deletions front/assets/dist/shared.4bc4549582216e4dc2ea.js.LICENSE.txt

This file was deleted.

54 changes: 54 additions & 0 deletions front/assets/readme.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
# Assets
benjavicente marked this conversation as resolved.
Show resolved Hide resolved

Directorio de assets empaquetados por [webpack][webpack].


## Preparación

La compilación de assets requiere [node][node-dowload].

```bash
# Ir al directorio de assets
cd front/assets/

# Si está instalado nvm - https://github.com/nvm-sh/nvm
nvm use

# Instalar dependencias
npm install
```

## Compilación de assets

```bash
# Ir al directorio de assets
cd front/assets/

# Correr webpack
npm run build
# o también, correr webpack en watch-mode
npm run dev
```

## Integración con Django

Para utilizar los assets generados se utiliza
la librería de python [django-manifest-loader][djm]
y el plugin de webpack [webpack-manifest-plugin][wmp].

Para utilizar un asset en un template, se utiliza

```django
{% load manifest %}
<link rel="stylesheet" href="{% manifest 'style_file.css' %}">
<script type="text/javascript" src="{% manifest 'script_file.js' %}"></script>
```

donde `script_file` y `style_file` son nombres de entradas
especificadas en [`webpack.config.js`](./webpack.config.js).


[node-dowload]: https://nodejs.org/es/download/current/
[webpack]: (https://webpack.js.org/)
[djm]: https://github.com/shonin/django-manifest-loader
[wmp]: https://github.com/shellscape/webpack-manifest-plugin
4 changes: 2 additions & 2 deletions front/assets/src/course.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import 'bootstrap';

// Public functions
import {loadInfo} from './info';
import {loadQuota} from './quota';
import {loadInfo} from './utils/info';
import {loadQuota} from './utils/quota';

export {loadInfo, loadQuota};
7 changes: 0 additions & 7 deletions front/assets/src/css/bootstrap.min.css

This file was deleted.

4 changes: 2 additions & 2 deletions front/assets/src/css/entry.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import 'bootstrap/dist/css/bootstrap.min.css';
import './multiple-select.min.css';
import './select.bootstrap.min.css';
import 'multiple-select/dist/multiple-select.min.css';
import 'multiple-select/dist/themes/bootstrap.min.css';
import './base.css';
10 changes: 0 additions & 10 deletions front/assets/src/css/multiple-select.min.css

This file was deleted.

10 changes: 0 additions & 10 deletions front/assets/src/css/select.bootstrap.min.css

This file was deleted.

14 changes: 7 additions & 7 deletions front/assets/src/planner.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ import 'bootstrap';
import 'multiple-select';

// Public functions
import {toggle, toggleRow, toggleDay, clearSelects} from './filters';
import {save, unsave, viewSaved, edit, share} from './save';
import {add, remove, loadRamo, loadFromCookie} from './schedule';
import {loadInfo} from './info';
import {search} from './search';
import {loadQuota} from './quota';
import {toggle, toggleRow, toggleDay, clearSelects} from './utils/filters';
import {save, unsave, viewSaved, edit, share} from './utils/save';
import {add, remove, loadRamo, loadFromCookie} from './utils/schedule';
import {loadInfo} from './utils/info';
import {search} from './utils/search';
import {loadQuota} from './utils/quota';

export {
toggle, toggleRow, toggleDay, clearSelects,
Expand Down Expand Up @@ -57,4 +57,4 @@ $(() => {
selectAll: false,
showClear: true
});
});
});
10 changes: 5 additions & 5 deletions front/assets/src/shared.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
// Public functions
import 'bootstrap';

import {loadInfo} from './info';
import {loadQuota} from './quota';
import {search} from './search';
import {edit} from './save';
import {loadRamo} from './schedule';
import {loadInfo} from './utils/info';
import {loadQuota} from './utils/quota';
import {search} from './utils/search';
import {edit} from './utils/save';
import {loadRamo} from './utils/schedule';

export {loadInfo, search, edit, loadRamo, loadQuota};
window.$ = $;
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ export const loadInfo = (id) => {

if (have_alert) modal.html(alerts);
else modal.html('');

// Rest of info
modal.append(`
<b>Campus:</b> ${course.campus}<br>
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ export const search = (page=1) => {
free_quota: free_quota,
page: page
}

$.get('/p_search', query_body)
.done(response => {
if (response.error) {
Expand Down
8 changes: 4 additions & 4 deletions front/assets/webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ var webpack = require('webpack');
module.exports = {
mode: 'production',
entry: {
planner: './src/planner.js',
shared: './src/shared.js',
course: './src/course.js',
browse: './src/browse.js',
index: './src/index.js',
course: './src/course.js',
generic: './src/generic.js',
index: './src/index.js',
planner: './src/planner.js',
shared: './src/shared.js',
},
plugins: [
new CleanWebpackPlugin(),
Expand Down